update to NC 13.0.4v0.57.0

5 files changed, 14 insertions, 19 deletions

diff --git a/changelog.md b/changelog.md
index 136fa9f0..665f4711 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,7 @@
 
-[v0.56.25](https://github.com/nextcloud/nextcloudpi/commit/13b8060) (2018-06-18) nc-snapshot-sync: upgrade
+[v0.57.0](https://github.com/nextcloud/nextcloudpi/commit/2591f25) (2018-06-18) update to NC 13.0.4
+
+[v0.56.25](https://github.com/nextcloud/nextcloudpi/commit/fe16326) (2018-06-18) nc-snapshot-sync: upgrade
 
 [v0.56.24](https://github.com/nextcloud/nextcloudpi/commit/16ce683) (2018-06-18) nc-datadir: make sure we have the correct permissions
 
diff --git a/etc/ncp-config.d/nc-autoupdate-nc.sh b/etc/ncp-config.d/nc-autoupdate-nc.sh
index 11636d02..2a63c5c8 100644
--- a/etc/ncp-config.d/nc-autoupdate-nc.sh
+++ b/etc/ncp-config.d/nc-autoupdate-nc.sh
@@ -11,11 +11,11 @@
 ACTIVE_=no
 NOTIFYUSER_=ncp
 DESCRIPTION="Automatically apply Nextcloud updates"
-VERSION=13.0.2
+VERSION=13.0.4
 
 configure() 
 {
-  [[ $ACTIVE_ != "yes" ]] && { 
+  [[ "$ACTIVE_" != "yes" ]] && { 
     rm /etc/cron.daily/ncp-autoupdate-nc
     echo "automatic Nextcloud updates disabled"
     return 0
diff --git a/etc/ncp-config.d/nc-nextcloud.sh b/etc/ncp-config.d/nc-nextcloud.sh
index ca9eb7b1..9b3a11fd 100644
--- a/etc/ncp-config.d/nc-nextcloud.sh
+++ b/etc/ncp-config.d/nc-nextcloud.sh
@@ -8,7 +8,7 @@
 # More at https://ownyourbits.com/2017/02/13/nextcloud-ready-raspberry-pi-image/
 #
 
-VER_=13.0.2
+VER_=13.0.4
 BETA_=no
 MAXFILESIZE_=2G
 MEMORYLIMIT_=768M
diff --git a/etc/ncp-config.d/nc-update-nextcloud.sh b/etc/ncp-config.d/nc-update-nextcloud.sh
index ca49afad..fa277ffa 100644
--- a/etc/ncp-config.d/nc-update-nextcloud.sh
+++ b/etc/ncp-config.d/nc-update-nextcloud.sh
@@ -8,7 +8,7 @@
 # More at https://ownyourbits.com/2017/02/13/nextcloud-ready-raspberry-pi-image/
 #
 
-VERSION_=13.0.2
+VERSION_=13.0.4
 DESCRIPTION="Update current instance to a new Nextcloud version"
 
 configure()
diff --git a/update.sh b/update.sh
index 622c5af0..cfc4fe8a 100755
--- a/update.sh
+++ b/update.sh
@@ -119,20 +119,6 @@ done
     :
   }
 
-  # fix exit status autoupdate
-  F="$CONFDIR"/nc-autoupdate-ncp.sh
-  grep -q '^ACTIVE_=yes$' "$F" && {
-    cd "$CONFDIR" &>/dev/null
-    activate_script nc-autoupdate-ncp.sh
-    cd -          &>/dev/null
-  }
-  F="$CONFDIR"/nc-autoupdate-nc.sh
-  grep -q '^ACTIVE_=yes$' "$F" && {
-    cd "$CONFDIR" &>/dev/null
-    activate_script nc-autoupdate-nc.sh
-    cd -          &>/dev/null
-  }
-
   # fix update httpd log location in virtual host after nc-datadir
   sed -i "s|CustomLog.*|CustomLog /var/log/apache2/nc-access.log combined|" /etc/apache2/sites-available/nextcloud.conf
   sed -i "s|ErrorLog .*|ErrorLog  /var/log/apache2/nc-error.log|"           /etc/apache2/sites-available/nextcloud.conf
@@ -226,6 +212,13 @@ EOF
   wget -q https://raw.githubusercontent.com/nachoparker/btrfs-snp/master/btrfs-snp -O /usr/local/bin/btrfs-snp
   chmod +x /usr/local/bin/btrfs-snp
 
+  # update to NC13.0.4
+  F="$CONFDIR"/nc-autoupdate-nc.sh
+  grep -q '^ACTIVE_=yes$' "$F" && {
+    cd "$CONFDIR" &>/dev/null
+    activate_script nc-autoupdate-nc.sh
+    cd -          &>/dev/null
+  }
 } # end - only live updates
 
 exit 0