From 18fc8bc8189bd23079e397ca51847f846371071b Mon Sep 17 00:00:00 2001
From: Robert Tidey <robert@tideys.net>
Date: Sun, 1 Nov 2015 22:36:45 +0000
Subject: [PATCH] Fix nginx change, install,sh moves material when changing
 folder

---
 etc/nginx/sites-available/rpicam.1 |  2 +-
 install.sh                         | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/etc/nginx/sites-available/rpicam.1 b/etc/nginx/sites-available/rpicam.1
index 8225dd80..aa6e8864 100644
--- a/etc/nginx/sites-available/rpicam.1
+++ b/etc/nginx/sites-available/rpicam.1
@@ -13,10 +13,10 @@ server {
             if (!-f $document_root$fastcgi_script_name) {
                     return 404;
             }
-            fastcgi_param SCRIPT_FILENAME $document_root/$fastcgi_script_name;
             fastcgi_pass unix:/var/run/php5-fpm.sock;
             fastcgi_index index.php;
             include fastcgi_params;
+            fastcgi_param SCRIPT_FILENAME $document_root/$fastcgi_script_name;
     }
 	location ~ /\.ht {
 		deny all;
diff --git a/install.sh b/install.sh
index 33953019..c36d26dc 100644
--- a/install.sh
+++ b/install.sh
@@ -66,6 +66,11 @@ if [ ! -e ./config.txt ]; then
 fi
 
 source ./config.txt
+rpicamdirold=$rpicamdir
+if [ ! "${rpicamold:0:1}" == "" ]; then
+   rpicamdirold=/$rpicamdirold
+fi
+
 
 #Allow for a quiet install
 if [ $# -eq 0 ] || [ "$1" != "q" ]; then
@@ -262,6 +267,13 @@ sudo chmod 755 /etc/rc.local
 fn_stop
 
 sudo mkdir -p /var/www$rpicamdir/media
+#move old material if changing from a different install folder
+if [ ! "$rpicamdir" == "$rpicamdirold" ]; then
+   if [ -e /var/www$rpicamdirold/index.php ]; then
+      sudo mv /var/www$rpicamdirold/* /var/www$rpicamdir
+   fi
+fi
+
 sudo cp -r www/* /var/www$rpicamdir/
 if [ -e /var/www$rpicamdir/index.html ]; then
    sudo rm /var/www$rpicamdir/index.html