From 066d972374013a952320fa43c20c728aab07857b Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Thu, 25 Oct 2018 22:25:10 +0100
Subject: [PATCH] Installing zap addons
---
src/freedombone-app-zap | 25 ++++++++-----------------
1 file changed, 8 insertions(+), 17 deletions(-)
diff --git a/src/freedombone-app-zap b/src/freedombone-app-zap
index 7da33ac79..a5abed018 100755
--- a/src/freedombone-app-zap
+++ b/src/freedombone-app-zap
@@ -36,8 +36,7 @@ ZAP_DOMAIN_NAME=
ZAP_CODE=
ZAP_REPO="https://framagit.org/macgirvin/osada"
ZAP_COMMIT='20f7479b83da8d3735a32ffd2d2e19cb4087bf6a'
-ZAP_ADDONS_REPO="https://framagit.org/macgirvin/osada-addons"
-ZAP_ADDONS_COMMIT='21099cbb65cc7a58e9ab1e7c2dba05ed510d1e86'
+ZAP_ADDONS_REPO="https://framagit.org/macgirvin/osada-addons.git"
ZAP_ADMIN_PASSWORD=
ZAP_SHORT_DESCRIPTION=$'Nomadic social network server'
@@ -128,7 +127,11 @@ function upgrade_zap {
function_check set_repo_commit
set_repo_commit "$ZAP_PATH" "zap commit" "$ZAP_COMMIT" $ZAP_REPO
- set_repo_commit "$ZAP_PATH/zaddons" "zap addons commit" "$ZAP_ADDONS_COMMIT" $ZAP_ADDONS_REPO
+ cd ${ZAP_PATH} || exit 34568735
+ ./util/update_addon_repo zaddons
+ chown -R www-data:www-data "$ZAP_PATH/extend"
+ ./util/importdoc
+ chown -R www-data:www-data "$ZAP_PATH/doc"
}
function backup_local_zap {
@@ -244,20 +247,6 @@ function install_zap {
git checkout "$ZAP_COMMIT" -b "$ZAP_COMMIT"
set_completion_param "zap commit" "$ZAP_COMMIT"
-
- if [ -d /repos/zap-addons ]; then
- mkdir -p "$ZAP_PATH/zaddons"
- cp -r -p /repos/zap-addons/. "$ZAP_PATH/zaddons"
- cd "$ZAP_PATH/zaddons" || exit 24682464
- git pull
- else
- git_clone "$ZAP_ADDONS_REPO" "$ZAP_PATH/zaddons"
- fi
-
- cd "$ZAP_PATH/zaddons" || exit 24982468
- git checkout "$ZAP_ADDONS_COMMIT" -b "$ZAP_ADDONS_COMMIT"
- set_completion_param "zap addons commit" "$ZAP_ADDONS_COMMIT"
-
chown -R www-data:www-data "$ZAP_PATH"
fi
@@ -462,6 +451,8 @@ function install_zap {
systemctl restart cron
cd "$ZAP_PATH" || exit 3658356
+ ./util/add_addon_repo ${ZAP_ADDONS_REPO} zaddons
+ chown -R www-data:www-data "$ZAP_PATH/extend"
./util/importdoc
chown -R www-data:www-data "$ZAP_PATH/doc"
--
GitLab