diff --git a/gui/setup.sh b/gui/setup.sh index 22e0826..50dc699 100755 --- a/gui/setup.sh +++ b/gui/setup.sh @@ -4,14 +4,14 @@ set -e [ -d bin ] || mkdir bin -[ -e bin/labca ] || set -ev -if [ ! -e bin/labca ]; then +[ -e bin/labca-gui ] || set -ev +if [ ! -e bin/labca-gui ]; then go mod download - go build -buildvcs=false -o bin/labca + go build -buildvcs=false -o bin/labca-gui fi [ -e /bin/ip ] || (apt update && apt install -y iproute2) [ -e /bin/zip ] || (apt update && apt install -y zip) -bin/labca +bin/labca-gui diff --git a/install b/install index b0ff0c7..8d1c3c1 100755 --- a/install +++ b/install @@ -374,7 +374,7 @@ copy_admin() { cd "$adminDir" grep \"version\" data/config.json &>/dev/null || sed -i -e 's/^}$/,\n "version": ""\n}/' data/config.json sed -i -e "s/\"version\": \".*\"/\"version\": \"$version\"/" data/config.json - [ ! -e bin/labca ] || mv bin/labca bin/labca_prev + [ ! -e bin/labca-gui ] || mv bin/labca-gui bin/labca-gui_prev chown -R labca:labca $baseDir chown root:root "$cloneDir/cron_d" diff --git a/utils.sh b/utils.sh index bacf829..0e770ac 100644 --- a/utils.sh +++ b/utils.sh @@ -2,7 +2,7 @@ set -e -export PS_LABCA="bin/labca" +export PS_LABCA="bin/labca-gui" export PS_BOULDER="bin/boulder" export PS_BOULDER_COUNT=13 export PS_MYSQL="mysqld"