From 51b1e5dd526e2795521834b4da0866ee3eb88a1b Mon Sep 17 00:00:00 2001
From: nachoparker <nacho@ownyourbits.com>
Date: Fri, 16 Feb 2018 12:41:50 +0100
Subject: update: accept github branch as an argument to ncp-update to test
 development branch

---
 bin/ncp-update |  7 ++++++-
 build-devel.sh | 22 +++-------------------
 2 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/bin/ncp-update b/bin/ncp-update
index 53cadc45..60141560 100755
--- a/bin/ncp-update
+++ b/bin/ncp-update
@@ -4,9 +4,14 @@
 
 {
   [ "$(id -u)" -ne 0 ] && { printf "Must be run as root. Try 'sudo $0'\n"; exit 1; }
+
   echo -e "Downloading updates"
   rm -rf /tmp/ncp-update-tmp
-  git clone --depth 20 -q https://github.com/nextcloud/nextcloudpi.git /tmp/ncp-update-tmp || {
+
+  BRANCH="${1:-master}"
+  [[ "$BRANCH" != "master" ]] && echo "INFO: updating to development branch $BRANCH"
+
+  git clone --depth 20 -b "$BRANCH" -q https://github.com/nextcloud/nextcloudpi.git /tmp/ncp-update-tmp || {
     echo "No internet connectivity"
     exit 1
   }
diff --git a/build-devel.sh b/build-devel.sh
index bfc7bd6a..98af67e1 100644
--- a/build-devel.sh
+++ b/build-devel.sh
@@ -23,27 +23,11 @@ install()
     pgrep apt &>/dev/null || break
     sleep 1
   done
-  rm -f /etc/apt/apt.conf.d/20nextcloudpi-upgrades
-
-  echo -e "Downloading updates"
-  rm -rf /tmp/ncp-update-tmp
-  git clone --depth 20 -q -b devel https://github.com/nextcloud/nextcloudpi.git /tmp/ncp-update-tmp
-  cd /tmp/ncp-update-tmp || return 1
-
-  echo -e "Performing updates"
-  ./update.sh && {
 
-    VER=$( git describe --always --tags | grep -oP "v\d+\.\d+\.\d+" )
-    grep -qP "v\d+\.\d+\.\d+" <<< $VER && {       # check format
-      echo "$VER" > /usr/local/etc/ncp-version
-      echo "$VER" > /var/run/.ncp-latest-version
-    }
-    echo -e "NextCloudPi updated to version $VER"
-  }
-
-  cd / || return 1
-  rm -rf /tmp/ncp-update-tmp
+  # disable unattended upgrades
+  rm -f /etc/apt/apt.conf.d/20nextcloudpi-upgrades
 
+  ncp-update devel
 }
 
 configure() { :; }
-- 
cgit v1.2.3