Browse Source

Remember previously selected blog theme

Bob Mottram 8 years ago
parent
commit
196b953902
No account linked to committer's email
2 changed files with 20 additions and 4 deletions
  1. 4
    0
      src/freedombone-image-mesh
  2. 16
    4
      src/freedombone-mesh-blog

+ 4
- 0
src/freedombone-image-mesh View File

@@ -786,6 +786,10 @@ function setup_ipfs {
786 786
         shred -zu /home/$MY_USERNAME/.blog-index
787 787
     fi
788 788
 
789
+    if [ -f /home/$MY_USERNAME/.blog-theme-index ]; then
790
+        shred -zu /home/$MY_USERNAME/.blog-theme-index
791
+    fi
792
+
789 793
     if [ -f /home/$MY_USERNAME/.ipfs-id ]; then
790 794
         shred -zu /home/$MY_USERNAME/.ipfs-id
791 795
     fi

+ 16
- 4
src/freedombone-mesh-blog View File

@@ -50,7 +50,7 @@ function ipfs_publish {
50 50
     echo ''
51 51
     echo $'Publishing to IPFS. This may take some time...'
52 52
 
53
-    OLD_STAT_FILE=/home/$MY_USERNAME/.old_stat.txt
53
+    OLD_STAT_FILE=/home/$USER/.old_stat.txt
54 54
     NEW_STAT=$(stat -t $DIR_TO_CHECK)
55 55
     echo $($IPFS_COMMAND add -rq /home/$USER/Public | tail -n 1) > $IPFS_PUBLIC
56 56
     echo "$NEW_STAT" > $OLD_STAT_FILE
@@ -171,13 +171,24 @@ function change_theme {
171 171
     themelist=""
172 172
     n=1
173 173
     theme_index=0
174
+    curr_theme_index=
175
+    if [ -f /home/$USER/.blog-theme-index ]; then
176
+        curr_theme_index=$(cat /home/$USER/.blog-theme-index)
177
+    fi
174 178
     for a in "${THEMES[@]}"
175 179
     do
176
-        if [[ $a == "basic" ]]; then
177
-            themelist="$themelist $n $a on"
180
+        is_selected='off'
181
+        if [ $curr_theme_index ]; then
182
+            if [ $n -eq $curr_theme_index ]; then
183
+                is_selected='on'
184
+            fi
178 185
         else
179
-            themelist="$themelist $n $a off"
186
+            if [[ $a == 'Just-Read' ]]; then
187
+                is_selected='on'
188
+            fi
180 189
         fi
190
+
191
+        themelist="$themelist $n $a $is_selected"
181 192
         n=$[n+1]
182 193
         theme_index=$[theme_index+1]
183 194
     done
@@ -195,6 +206,7 @@ function change_theme {
195 206
         255) exit 1;;
196 207
     esac
197 208
     CHOSEN_THEME_INDEX=$(cat $data)
209
+    echo "$CHOSEN_THEME_INDEX" > /home/$USER/.blog-theme-index
198 210
     CHOSEN_THEME_INDEX=$((CHOSEN_THEME_INDEX - 1))
199 211
 
200 212
     CHOSEN_THEME=${THEMES[$CHOSEN_THEME_INDEX]}