From 196b95390207044021e882be80fde3c92dc6dfe4 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Fri, 9 Sep 2016 14:49:23 +0100
Subject: [PATCH] Remember previously selected blog theme

---
 src/freedombone-image-mesh |  4 ++++
 src/freedombone-mesh-blog  | 20 ++++++++++++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/freedombone-image-mesh b/src/freedombone-image-mesh
index 375c1f8a..1d5f2a50 100755
--- a/src/freedombone-image-mesh
+++ b/src/freedombone-image-mesh
@@ -786,6 +786,10 @@ function setup_ipfs {
         shred -zu /home/$MY_USERNAME/.blog-index
     fi
 
+    if [ -f /home/$MY_USERNAME/.blog-theme-index ]; then
+        shred -zu /home/$MY_USERNAME/.blog-theme-index
+    fi
+
     if [ -f /home/$MY_USERNAME/.ipfs-id ]; then
         shred -zu /home/$MY_USERNAME/.ipfs-id
     fi
diff --git a/src/freedombone-mesh-blog b/src/freedombone-mesh-blog
index 5fa44dcc..cecab3c7 100755
--- a/src/freedombone-mesh-blog
+++ b/src/freedombone-mesh-blog
@@ -50,7 +50,7 @@ function ipfs_publish {
     echo ''
     echo $'Publishing to IPFS. This may take some time...'
 
-    OLD_STAT_FILE=/home/$MY_USERNAME/.old_stat.txt
+    OLD_STAT_FILE=/home/$USER/.old_stat.txt
     NEW_STAT=$(stat -t $DIR_TO_CHECK)
     echo $($IPFS_COMMAND add -rq /home/$USER/Public | tail -n 1) > $IPFS_PUBLIC
     echo "$NEW_STAT" > $OLD_STAT_FILE
@@ -171,13 +171,24 @@ function change_theme {
     themelist=""
     n=1
     theme_index=0
+    curr_theme_index=
+    if [ -f /home/$USER/.blog-theme-index ]; then
+        curr_theme_index=$(cat /home/$USER/.blog-theme-index)
+    fi
     for a in "${THEMES[@]}"
     do
-        if [[ $a == "basic" ]]; then
-            themelist="$themelist $n $a on"
+        is_selected='off'
+        if [ $curr_theme_index ]; then
+            if [ $n -eq $curr_theme_index ]; then
+                is_selected='on'
+            fi
         else
-            themelist="$themelist $n $a off"
+            if [[ $a == 'Just-Read' ]]; then
+                is_selected='on'
+            fi
         fi
+
+        themelist="$themelist $n $a $is_selected"
         n=$[n+1]
         theme_index=$[theme_index+1]
     done
@@ -195,6 +206,7 @@ function change_theme {
         255) exit 1;;
     esac
     CHOSEN_THEME_INDEX=$(cat $data)
+    echo "$CHOSEN_THEME_INDEX" > /home/$USER/.blog-theme-index
     CHOSEN_THEME_INDEX=$((CHOSEN_THEME_INDEX - 1))
 
     CHOSEN_THEME=${THEMES[$CHOSEN_THEME_INDEX]}