0ct0pu5/runtipi
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #208 from dextreem/fix/start-stop [skip ci]

Browse source 
Fixing minor issues in start and stop scripts [skip ci]
This commit is contained in:
Nicolas Meienberger 2022-09-21 06:52:51 +00:00 • committed by GitHub
commit 86e4ddfc53
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/start.sh
View file

@ -75,7 +75,7 @@ while [ -n "$1" ]; do # while loop starts
done
# Ensure BASH_SOURCE is ./scripts/start.sh
if [[ "${BASH_SOURCE[0]}" != "./scripts/start.sh" ]]; then
if [[ $(basename $(pwd)) != "runtipi" ]] || [[ ! -f "${BASH_SOURCE[0]}" ]]; then
echo "Please make sure this script is executed from runtipi/"
exit 1
fi

24
scripts/stop.sh
View file

@ -11,7 +11,7 @@ fi
if [[ $UID != 0 ]]; then
echo "Tipi must be stopped as root"
echo "Please re-run this script as"
echo " sudo ./scripts/stop"
echo " sudo ./scripts/stop.sh"
exit 1
fi
@ -23,17 +23,21 @@ cd "$ROOT_FOLDER"
export DOCKER_CLIENT_TIMEOUT=240
export COMPOSE_HTTP_TIMEOUT=240
# Get all app names from the apps folder
# Stop all installed apps if there are any
apps_folder="${ROOT_FOLDER}/apps"
apps_names=($(ls -d ${apps_folder}/*/ | xargs -n 1 basename | sed 's/\///g'))
if [ "$(find ${apps_folder} -maxdepth 1 -type d | wc -l)" -gt 1 ]; then
apps_names=($(ls -d ${apps_folder}/*/ | xargs -n 1 basename | sed 's/\///g'))
for app_name in "${apps_names[@]}"; do
# if folder ${ROOT_FOLDER}/app-data/app_name exists, then stop app
if [[ -d "${ROOT_FOLDER}/app-data/${app_name}" ]]; then
echo "Stopping ${app_name}"
"${ROOT_FOLDER}/scripts/app.sh" stop $app_name
fi
done
for app_name in "${apps_names[@]}"; do
# if folder ${ROOT_FOLDER}/app-data/app_name exists, then stop app
if [[ -d "${ROOT_FOLDER}/app-data/${app_name}" ]]; then
echo "Stopping ${app_name}"
"${ROOT_FOLDER}/scripts/app.sh" stop $app_name
fi
done
else
echo "No app installed that can be stopped."
fi
echo "Stopping Docker services..."
echo