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
         shred -zu /home/$MY_USERNAME/.blog-index
786
         shred -zu /home/$MY_USERNAME/.blog-index
787
     fi
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
     if [ -f /home/$MY_USERNAME/.ipfs-id ]; then
793
     if [ -f /home/$MY_USERNAME/.ipfs-id ]; then
790
         shred -zu /home/$MY_USERNAME/.ipfs-id
794
         shred -zu /home/$MY_USERNAME/.ipfs-id
791
     fi
795
     fi

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

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