mirror of
https://framagit.org/YunoHost-Apps/gitea_ynh.git
synced 2024-11-21 18:41:35 +01:00
Add missing quotes
This commit is contained in:
parent
b2c1604b83
commit
0614ab83dc
@ -3,7 +3,7 @@
|
|||||||
#=================================================
|
#=================================================
|
||||||
|
|
||||||
systemd_match_start_line='Starting new Web server: tcp:127.0.0.1:'
|
systemd_match_start_line='Starting new Web server: tcp:127.0.0.1:'
|
||||||
ssh_port=$(yunohost settings get security.ssh.ssh_port)
|
ssh_port="$(yunohost settings get security.ssh.ssh_port)"
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
# DEFINE ALL COMMON FONCTIONS
|
# DEFINE ALL COMMON FONCTIONS
|
||||||
@ -15,10 +15,10 @@ _set_permissions() {
|
|||||||
chmod +x "$install_dir/gitea"
|
chmod +x "$install_dir/gitea"
|
||||||
|
|
||||||
chown -R "$app:$app" "$data_dir"
|
chown -R "$app:$app" "$data_dir"
|
||||||
find $data_dir \( \! -perm -o= \
|
find "$data_dir" \( \! -perm -o= \
|
||||||
-o \! -user $app \
|
-o \! -user "$app" \
|
||||||
-o \! -group $app \) \
|
-o \! -group "$app" \) \
|
||||||
-exec chown $app:$app {} \; \
|
-exec chown "$app:$app" {} \; \
|
||||||
-exec chmod u=rwX,g=rX,o= {} \;
|
-exec chmod u=rwX,g=rX,o= {} \;
|
||||||
chmod -R u=rwX,g=,o= "$data_dir/.ssh"
|
chmod -R u=rwX,g=,o= "$data_dir/.ssh"
|
||||||
|
|
||||||
|
@ -9,7 +9,7 @@ source ../settings/scripts/_common.sh
|
|||||||
source /usr/share/yunohost/helpers
|
source /usr/share/yunohost/helpers
|
||||||
|
|
||||||
|
|
||||||
if systemctl is-active $app.service --quiet; then
|
if systemctl is-active "$app".service --quiet; then
|
||||||
ynh_print_warn --message="It's hightly recommended to make your backup when the service is stopped. Please stop $app service with this command before to run the backup 'systemctl stop $app.service'"
|
ynh_print_warn --message="It's hightly recommended to make your backup when the service is stopped. Please stop $app service with this command before to run the backup 'systemctl stop $app.service'"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -17,10 +17,10 @@ source /usr/share/yunohost/helpers
|
|||||||
|
|
||||||
ynh_script_progression --message='Creating base directory...'
|
ynh_script_progression --message='Creating base directory...'
|
||||||
|
|
||||||
if [ -n "$(ls -A $data_dir)" ]; then
|
if [ -n "$(ls -A "$data_dir")" ]; then
|
||||||
old_data_dir_path="${data_dir}_$(date '+%Y%m%d.%H%M%S')"
|
old_data_dir_path="${data_dir}_$(date '+%Y%m%d.%H%M%S')"
|
||||||
ynh_print_warn "Data directory was not empty. Data was moved to $old_data_dir_path"
|
ynh_print_warn "Data directory was not empty. Data was moved to $old_data_dir_path"
|
||||||
mkdir -p $old_data_dir_path
|
mkdir -p "$old_data_dir_path"
|
||||||
mv -t "$old_data_dir_path" "$data_dir"/*
|
mv -t "$old_data_dir_path" "$data_dir"/*
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -42,10 +42,10 @@ _set_permissions
|
|||||||
|
|
||||||
ynh_script_progression --message="Configuring application, step 1/2..."
|
ynh_script_progression --message="Configuring application, step 1/2..."
|
||||||
|
|
||||||
internal_token=$(ynh_exec_as "$app" "$install_dir/gitea" generate secret INTERNAL_TOKEN)
|
internal_token="$(ynh_exec_as "$app" "$install_dir/gitea" generate secret INTERNAL_TOKEN)"
|
||||||
secret_key=$(ynh_exec_as "$app" "$install_dir/gitea" generate secret SECRET_KEY)
|
secret_key="$(ynh_exec_as "$app" "$install_dir/gitea" generate secret SECRET_KEY)"
|
||||||
lfs_jwt_secret=$(ynh_exec_as "$app" "$install_dir/gitea" generate secret JWT_SECRET)
|
lfs_jwt_secret="$(ynh_exec_as "$app" "$install_dir/gitea" generate secret JWT_SECRET)"
|
||||||
jwt_secret=$(ynh_exec_as "$app" "$install_dir/gitea" generate secret JWT_SECRET)
|
jwt_secret="$(ynh_exec_as "$app" "$install_dir/gitea" generate secret JWT_SECRET)"
|
||||||
|
|
||||||
ynh_app_setting_set --app="$app" --key=internal_token --value="$internal_token"
|
ynh_app_setting_set --app="$app" --key=internal_token --value="$internal_token"
|
||||||
ynh_app_setting_set --app="$app" --key=secret_key --value="$secret_key"
|
ynh_app_setting_set --app="$app" --key=secret_key --value="$secret_key"
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
source _common.sh
|
source _common.sh
|
||||||
source /usr/share/yunohost/helpers
|
source /usr/share/yunohost/helpers
|
||||||
|
|
||||||
upgrade_type=$(ynh_check_app_version_changed)
|
upgrade_type="$(ynh_check_app_version_changed)"
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
# STANDARD UPGRADE STEPS
|
# STANDARD UPGRADE STEPS
|
||||||
@ -69,12 +69,12 @@ chmod -R u=rwX,g=rX,o= "$install_dir"
|
|||||||
chmod +x "$install_dir/gitea"
|
chmod +x "$install_dir/gitea"
|
||||||
|
|
||||||
if [[ -z "${internal_token:-}" ]]; then
|
if [[ -z "${internal_token:-}" ]]; then
|
||||||
internal_token=$(ynh_exec_as "$app" "$install_dir/gitea" generate secret INTERNAL_TOKEN)
|
internal_token="$(ynh_exec_as "$app" "$install_dir/gitea" generate secret INTERNAL_TOKEN)"
|
||||||
ynh_app_setting_set --app="$app" --key=internal_token --value="$internal_token"
|
ynh_app_setting_set --app="$app" --key=internal_token --value="$internal_token"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -z "${secret_key:-}" ]]; then
|
if [[ -z "${secret_key:-}" ]]; then
|
||||||
secret_key=$(ynh_exec_as "$app" "$install_dir/gitea" generate secret SECRET_KEY)
|
secret_key="$(ynh_exec_as "$app" "$install_dir/gitea" generate secret SECRET_KEY)"
|
||||||
ynh_app_setting_set --app="$app" --key=secret_key --value="$secret_key"
|
ynh_app_setting_set --app="$app" --key=secret_key --value="$secret_key"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -85,12 +85,12 @@ if [[ -n "${lfs_key:-}" ]]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -z "${lfs_jwt_secret:-}" ]]; then
|
if [[ -z "${lfs_jwt_secret:-}" ]]; then
|
||||||
lfs_jwt_secret=$(ynh_exec_as "$app" "$install_dir/gitea" generate secret JWT_SECRET)
|
lfs_jwt_secret="$(ynh_exec_as "$app" "$install_dir/gitea" generate secret JWT_SECRET)"
|
||||||
ynh_app_setting_set --app="$app" --key=lfs_jwt_secret --value="$lfs_jwt_secret"
|
ynh_app_setting_set --app="$app" --key=lfs_jwt_secret --value="$lfs_jwt_secret"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -z "${jwt_secret:-}" ]]; then
|
if [[ -z "${jwt_secret:-}" ]]; then
|
||||||
jwt_secret=$(ynh_exec_as "$app" "$install_dir/gitea" generate secret JWT_SECRET)
|
jwt_secret="$(ynh_exec_as "$app" "$install_dir/gitea" generate secret JWT_SECRET)"
|
||||||
ynh_app_setting_set --app="$app" --key=jwt_secret --value="$jwt_secret"
|
ynh_app_setting_set --app="$app" --key=jwt_secret --value="$jwt_secret"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -98,7 +98,7 @@ fi
|
|||||||
# MIGRATION STEP Fix regression linked to 77c3678 and #76
|
# MIGRATION STEP Fix regression linked to 77c3678 and #76
|
||||||
#=================================================
|
#=================================================
|
||||||
|
|
||||||
list_param_sql=$(yunohost user list --output-as json | jq -c '.users | keys' | sed 's|\[|\(|' | sed 's|\]|\)|')
|
list_param_sql="$(yunohost user list --output-as json | jq -c '.users | keys' | sed 's|\[|\(|' | sed 's|\]|\)|')"
|
||||||
ynh_replace_string --match_string=__APP__ --replace_string="$app" --target_file=./fix_user_db_for_local_users.sql
|
ynh_replace_string --match_string=__APP__ --replace_string="$app" --target_file=./fix_user_db_for_local_users.sql
|
||||||
ynh_replace_string --match_string=__USER_LIST__ --replace_string="$list_param_sql" --target_file=./fix_user_db_for_local_users.sql
|
ynh_replace_string --match_string=__USER_LIST__ --replace_string="$list_param_sql" --target_file=./fix_user_db_for_local_users.sql
|
||||||
ynh_mysql_connect_as "$db_user" "$db_pwd" "$db_name" < ./fix_user_db_for_local_users.sql
|
ynh_mysql_connect_as "$db_user" "$db_pwd" "$db_name" < ./fix_user_db_for_local_users.sql
|
||||||
|
Loading…
Reference in New Issue
Block a user