diff options
author | nachoparker <nacho@ownyourbits.com> | 2018-02-16 14:41:50 +0300 |
---|---|---|
committer | nachoparker <nacho@ownyourbits.com> | 2018-02-16 14:42:06 +0300 |
commit | 51b1e5dd526e2795521834b4da0866ee3eb88a1b (patch) | |
tree | f78c1e9b1a8106d5fc7916dee11d456437da5595 | |
parent | f03931116fda60b5d37da512f426ed2663a2c1df (diff) |
update: accept github branch as an argument to ncp-update to test development branchv0.46.13
-rwxr-xr-x | bin/ncp-update | 7 | ||||
-rw-r--r-- | 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() { :; } |