From 67415a3b63f315f0c2f96632acb8e27db5b65f1f Mon Sep 17 00:00:00 2001 From: nachoparker Date: Sat, 5 Jan 2019 09:45:35 -0700 Subject: [PATCH] build: curl installer fixes --- build-VM.sh | 1 + install.sh | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/build-VM.sh b/build-VM.sh index 985deb74..df9522f8 100755 --- a/build-VM.sh +++ b/build-VM.sh @@ -31,6 +31,7 @@ prepare_dirs # tmp cache output echo -e "\e[1m\n[ Build NCP ]\e[0m" vagrant destroy -f +vagrant box update vagrant up --provider=libvirt --provision sudo qemu-img rebase -b "" "$VM" diff --git a/install.sh b/install.sh index bde7604e..96ad82c5 100644 --- a/install.sh +++ b/install.sh @@ -34,7 +34,7 @@ type mysqld &>/dev/null && echo ">>> WARNING: existing mysqld configuration wil # get install code echo "Getting build code..." apt-get update -apt-get install --no-install-recommends -y wget ca-certificates sudo +apt-get install --no-install-recommends -y wget ca-certificates sudo jq pushd "$TMPDIR" wget -O- --content-disposition https://github.com/nextcloud/nextcloudpi/archive/"$BRANCH"/latest.tar.gz \ @@ -50,10 +50,10 @@ mkdir -p /usr/local/etc/ncp-config.d/ cp etc/ncp-config.d/nc-nextcloud.cfg /usr/local/etc/ncp-config.d/ install_app lamp.sh -install_app etc/ncp-config.d/nc-nextcloud.sh -run_app_unsafe etc/ncp-config.d/nc-nextcloud.sh +install_app bin/ncp/CONFIG/nc-nextcloud.sh +run_app_unsafe bin/ncp/CONFIG/nc-nextcloud.sh install_app ncp.sh -run_app_unsafe etc/ncp-config.d/nc-init.sh +run_app_unsafe bin/ncp/CONFIG/nc-init.sh popd