Merge pull request #234 from MiczFlor/develop

fix in setup script for version 1.1.4

docs/UPGRADE.md

@@ -13,16 +13,25 @@ There is a file `settings/version` containing the version number.
 
 **Note:*** This is work in progress, please share experience, improvements and insights in the [issue section](https://github.com/MiczFlor/RPi-Jukebox-RFID/issues).
 
-# Upgrade from Version 1.1.1 to 1.1.2
+# Upgrade from Version 1.1.1 to 1.1.3
 
-A few important bug fixes. And a new design. And the option to decide what the 'second swipe' of a card does (see settings in the web app).
+A few important bug fixes. And a new design. 
+And the option to decide what the 'second swipe' of a card does (see settings in the web app).
+The following should get you all you need, without running the install script if you
+only want to upgrade. 
 
 ~~~
-cd
-cd RPi-Jukebox-RFID
-git fetch
+cd /home/pi/RPi-Jukebox-RFID
 git checkout master
+git fetch origin
+git reset --hard origin/master
 git pull
+sudo chown -R pi:www-data /home/pi/RPi-Jukebox-RFID/shared
+sudo chmod -R 775 /home/pi/RPi-Jukebox-RFID/shared
+sudo chown -R pi:www-data /home/pi/RPi-Jukebox-RFID/htdocs
+sudo chmod -R 775 /home/pi/RPi-Jukebox-RFID/htdocs
+sudo chown -R pi:www-data /home/pi/RPi-Jukebox-RFID/settings
+sudo chmod -R 777 /home/pi/RPi-Jukebox-RFID/settings
 ~~~
 
 # Upgrade from Version 1.0.0 to 1.1.1

scripts/installscripts/stretch-install-default.sh

@@ -618,8 +618,8 @@ sudo chmod -R 775 /home/pi/RPi-Jukebox-RFID/shared
 sudo chown -R pi:www-data /home/pi/RPi-Jukebox-RFID/htdocs
 sudo chmod -R 775 /home/pi/RPi-Jukebox-RFID/htdocs
 
-sudo chown pi:www-data /home/pi/RPi-Jukebox-RFID/settings
-sudo chmod 775 /home/pi/RPi-Jukebox-RFID/settings
+sudo chown -R pi:www-data /home/pi/RPi-Jukebox-RFID/settings
+sudo chmod -R 775 /home/pi/RPi-Jukebox-RFID/settings
 
 # audio folders might be somewhere else, so treat them separately
 sudo chown pi:www-data "$DIRaudioFolders"

settings/version

@@ -1 +1 @@
-1.1.3
+1.1.4