YunoHost-Apps/baikal_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/baikal_ynh.git synced 2024-09-03 18:16:11 +02:00
Code Issues Activity Actions

[fix] Harden set options in scripts and remove silently

Browse source
This commit is contained in:
Jérôme Lebleu 2016-05-23 22:03:55 +02:00
parent f38ed83384
commit e065a1afc2
5 changed files with 35 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
scripts/backup
View file

@ -1,8 +1,10 @@
#!/bin/bash #!/bin/bash
# Retrieve arguments # Exit on command errors and treat unset variables as an error
backup_dir=$1 set -eu
app=$2
# Retrieve app id
app=$YNH_APP_INSTANCE_NAME
# Set app specific variables # Set app specific variables
dbname=$app dbname=$app

9
scripts/install
View file

@ -1,15 +1,18 @@
#!/bin/bash #!/bin/bash
set -e # Exit on command errors and treat unset variables as an error
set -eu
# Retrieve app id
app=$YNH_APP_INSTANCE_NAME
# Retrieve arguments # Retrieve arguments
domain=$1 domain=$1
path=${2%/} path=${2%/}
password=$3 password=$3
app=${!#}
# Load common variables and helpers # Load common variables and helpers
source ./_common.sh . ./_common.sh
# Set app specific variables # Set app specific variables
dbname=$app dbname=$app

12
scripts/remove
View file

@ -1,21 +1,21 @@
#!/bin/bash #!/bin/bash
# Retrieve arguments # Retrieve app id
app=${!#} app=$YNH_APP_INSTANCE_NAME
# Load common variables and helpers # Load common variables and helpers
source ./_common.sh . ./_common.sh
# Set app specific variables # Set app specific variables
dbname=$app dbname=$app
dbuser=$app dbuser=$app
# Drop MySQL database and user # Drop MySQL database and user
ynh_mysql_drop_db $dbname || true ynh_mysql_drop_db "$dbname" 2>/dev/null || true
ynh_mysql_drop_user $dbuser || true ynh_mysql_drop_user "$dbuser" 2>/dev/null || true
# Retrieve domain from app settings # Retrieve domain from app settings
domain=$(ynh_app_setting_get $app domain) domain=$(ynh_app_setting_get "$app" domain)
# Delete app directory and configurations # Delete app directory and configurations
sudo rm -rf "/var/www/${app}" sudo rm -rf "/var/www/${app}"

14
scripts/restore
View file

@ -1,12 +1,10 @@
#!/bin/bash #!/bin/bash
# Retrieve arguments # Exit on command errors and treat unset variables as an error
backup_dir=$1 set -eu
app=$2
# Set app specific variables # Retrieve app id
dbname=$app app=$YNH_APP_INSTANCE_NAME
dbuser=$app
# Source app helpers # Source app helpers
. /usr/share/yunohost/helpers . /usr/share/yunohost/helpers
@ -16,6 +14,10 @@ domain=$(ynh_app_setting_get "$app" domain)
path=$(ynh_app_setting_get "$app" path) path=$(ynh_app_setting_get "$app" path)
dbpass=$(ynh_app_setting_get "$app" mysqlpwd) dbpass=$(ynh_app_setting_get "$app" mysqlpwd)
# Set app specific variables
dbname=$app
dbuser=$app
# Check domain/path availability # Check domain/path availability
sudo yunohost app checkurl "${domain}${path}" -a "$app" \ sudo yunohost app checkurl "${domain}${path}" -a "$app" \
|| exit 1 || exit 1

17
scripts/upgrade
View file

@ -1,20 +1,23 @@
#!/bin/bash #!/bin/bash
set -u # Exit on command errors and treat unset variables as an error
set -eu
# Retrieve app id
app=$YNH_APP_INSTANCE_NAME
# Load common variables and helpers # Load common variables and helpers
. ./_common.sh . ./_common.sh
# Set app specific variables # Retrieve app settings
app=${!#}
dbname=$app
dbuser=$app
# Retrieve arguments
domain=$(ynh_app_setting_get "$app" domain) domain=$(ynh_app_setting_get "$app" domain)
path=$(ynh_app_setting_get "$app" path) path=$(ynh_app_setting_get "$app" path)
path=${path%/} path=${path%/}
# Set app specific variables
dbname=$app
dbuser=$app
# Check destination directory # Check destination directory
DESTDIR="/var/www/$app" DESTDIR="/var/www/$app"
[[ ! -d $DESTDIR ]] && ynh_die \ [[ ! -d $DESTDIR ]] && ynh_die \