From ea63e235a5a0f1286305f913974e5b7183dc3601 Mon Sep 17 00:00:00 2001 From: philc Date: Fri, 8 Nov 2024 12:02:39 +0100 Subject: [PATCH] setup and apxtri.js for setup --- apxtri/apxtri.js | 2 +- apxtri/setup/setup.sh | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/apxtri/apxtri.js b/apxtri/apxtri.js index 86efc99..c46b289 100755 --- a/apxtri/apxtri.js +++ b/apxtri/apxtri.js @@ -187,7 +187,7 @@ apxtri.setuptribe = async (tribe, conf) => { // this command is ran by the setup.sh // grep -q '^127.0.0.1 adminapx.adminapi' /etc/hosts || echo '127.0.0.1 adminapx.adminapi' | sudo tee -a /etc/hosts > /dev/null const ips = await apxtri.getip(); - const nginxrestart = inittribe.nginx.restart + const nginxrestart = (inittribe.nginx && inittribe.nginx.restart) ? inittribe.nginx.restart : fs.readJSONSync("../adminapi/apxtri/setup/initadminapi.json").nginx .restart; diff --git a/apxtri/setup/setup.sh b/apxtri/setup/setup.sh index eed1ed1..5b2e902 100755 --- a/apxtri/setup/setup.sh +++ b/apxtri/setup/setup.sh @@ -38,18 +38,16 @@ function help { } if [ -z "$tribe" ]; then + echo "Tribe must be defined" help else if [ "$url" == "newtribe"]; then mkdir -p "${tribe}" else wget "${url}/${tribe}/setup.objects.tar.gz" - if [[ $? -eq 0 ]]; then + if [[ $? -ne 0 ]]; then echo "Check the url:$url seems not answer" - urlko=1 - fi - if [[ "$urlok" -eq 1 || -z "$tribe" ]]; then - help + help else # add 127.0.0.1 town.nation in /ertc/hoss if not already exist to make localhost available dns=$(basename "$PWD" | sed 's/-/./g')