mirror of
https://github.com/YunoHost-Apps/yeswiki_ynh.git
synced 2024-09-03 18:05:56 +02:00
Fix $app variable substitution
This commit is contained in:
parent
0ae393d747
commit
8af61e56ee
5 changed files with 13 additions and 13 deletions
|
@ -43,7 +43,7 @@ ynh_backup --src_path="/etc/sudoers.d/$app"
|
||||||
# BACKUP THE IMPORTER PLUGIN POST APP INSTALL HOOK
|
# BACKUP THE IMPORTER PLUGIN POST APP INSTALL HOOK
|
||||||
#=================================================
|
#=================================================
|
||||||
|
|
||||||
ynh_backup --src_path="/etc/yunohost/hooks.d/post_app_install/$app_sync_app_importer.sh"
|
ynh_backup --src_path="/etc/yunohost/hooks.d/post_app_install/${app}_sync_app_importer.sh"
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
# BACKUP THE MYSQL DATABASE
|
# BACKUP THE MYSQL DATABASE
|
||||||
|
|
|
@ -17,7 +17,7 @@ ynh_script_progression --message="Setting up source files..." --weight=5
|
||||||
# Download, check integrity, uncompress and patch the source from app.src
|
# Download, check integrity, uncompress and patch the source from app.src
|
||||||
ynh_setup_source --dest_dir="$install_dir"
|
ynh_setup_source --dest_dir="$install_dir"
|
||||||
|
|
||||||
chown -R $app:www-data $install_dir
|
chown -R ${app}:www-data $install_dir
|
||||||
chmod -R u=rwX,g=rX,o-rwx $install_dir
|
chmod -R u=rwX,g=rX,o-rwx $install_dir
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
|
@ -103,9 +103,9 @@ ynh_add_config --template="sudoers" --destination="/etc/sudoers.d/$app"
|
||||||
chown root:root /etc/sudoers.d/$app
|
chown root:root /etc/sudoers.d/$app
|
||||||
|
|
||||||
# Add a post app install hook to sync the app importer
|
# Add a post app install hook to sync the app importer
|
||||||
ynh_add_config --template="sync_app_importer.sh" --destination="/etc/yunohost/hooks.d/post_app_install/$app_sync_app_importer.sh"
|
ynh_add_config --template="sync_app_importer.sh" --destination="/etc/yunohost/hooks.d/post_app_install/${app}_sync_app_importer.sh"
|
||||||
chown root:root /etc/yunohost/hooks.d/post_app_install/$app_sync_app_importer.sh
|
chown root:root /etc/yunohost/hooks.d/post_app_install/${app}_sync_app_importer.sh
|
||||||
chmod +x /etc/yunohost/hooks.d/post_app_install/$app_sync_app_importer.sh
|
chmod +x /etc/yunohost/hooks.d/post_app_install/${app}_sync_app_importer.sh
|
||||||
|
|
||||||
# At last, run the YunoHost app importer
|
# At last, run the YunoHost app importer
|
||||||
ynh_script_progression --message="Import YunoHost apps in bazar" --weight=2
|
ynh_script_progression --message="Import YunoHost apps in bazar" --weight=2
|
||||||
|
@ -146,7 +146,7 @@ fi
|
||||||
# SECURE FILES AND DIRECTORIES
|
# SECURE FILES AND DIRECTORIES
|
||||||
#=================================================
|
#=================================================
|
||||||
|
|
||||||
chown -R $app:www-data $install_dir
|
chown -R ${app}:www-data $install_dir
|
||||||
chmod -R u=rwX,g=rX,o-rwx $install_dir
|
chmod -R u=rwX,g=rX,o-rwx $install_dir
|
||||||
chmod g-rwx $install_dir/wakka.config.php
|
chmod g-rwx $install_dir/wakka.config.php
|
||||||
|
|
||||||
|
|
|
@ -24,7 +24,7 @@ ynh_remove_fpm_config
|
||||||
ynh_secure_remove --file="/etc/sudoers/$app"
|
ynh_secure_remove --file="/etc/sudoers/$app"
|
||||||
|
|
||||||
# Remove post app install hook
|
# Remove post app install hook
|
||||||
ynh_secure_remove --file="/etc/yunohost/hooks.d/post_app_install/$app_sync_app_importer.sh"
|
ynh_secure_remove --file="/etc/yunohost/hooks.d/post_app_install/${app}_sync_app_importer.sh"
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
# END OF SCRIPT
|
# END OF SCRIPT
|
||||||
|
|
|
@ -47,7 +47,7 @@ ynh_restore_file --origin_path="/etc/sudoers.d/$app"
|
||||||
#=================================================
|
#=================================================
|
||||||
ynh_script_progression --message="Restoring the app importer post app install hook..."
|
ynh_script_progression --message="Restoring the app importer post app install hook..."
|
||||||
|
|
||||||
ynh_restore_file --origin_path="/etc/yunohost/hooks.d/post_app_install/$app_sync_app_importer.sh"
|
ynh_restore_file --origin_path="/etc/yunohost/hooks.d/post_app_install/${app}_sync_app_importer.sh"
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
# RESTORE THE MYSQL DATABASE
|
# RESTORE THE MYSQL DATABASE
|
||||||
|
|
|
@ -35,7 +35,7 @@ if [ "$upgrade_type" == "UPGRADE_APP" ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
chmod -R o-rwx "$install_dir"
|
chmod -R o-rwx "$install_dir"
|
||||||
chown -R $app:www-data "$install_dir"
|
chown -R ${app}:www-data "$install_dir"
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
# PHP-FPM CONFIGURATION
|
# PHP-FPM CONFIGURATION
|
||||||
|
@ -81,9 +81,9 @@ ynh_add_config --template="sudoers" --destination="/etc/sudoers.d/$app"
|
||||||
chown root:root /etc/sudoers.d/$app
|
chown root:root /etc/sudoers.d/$app
|
||||||
|
|
||||||
# Add a post app install hook to sync the app importer
|
# Add a post app install hook to sync the app importer
|
||||||
ynh_add_config --template="sync_app_importer.sh" --destination="/etc/yunohost/hooks.d/post_app_install/$app_sync_app_importer.sh"
|
ynh_add_config --template="sync_app_importer.sh" --destination="/etc/yunohost/hooks.d/post_app_install/${app}_sync_app_importer.sh"
|
||||||
chown root:root /etc/yunohost/hooks.d/post_app_install/$app_sync_app_importer.sh
|
chown root:root /etc/yunohost/hooks.d/post_app_install/${app}_sync_app_importer.sh
|
||||||
chmod +x /etc/yunohost/hooks.d/post_app_install/$app_sync_app_importer.sh
|
chmod +x /etc/yunohost/hooks.d/post_app_install/${app}_sync_app_importer.sh
|
||||||
|
|
||||||
# ToDo : Add importer config in wakka.config.php if it is not already there ?
|
# ToDo : Add importer config in wakka.config.php if it is not already there ?
|
||||||
# if [ ??? ]; then
|
# if [ ??? ]; then
|
||||||
|
@ -100,7 +100,7 @@ popd
|
||||||
# SECURE FILES AND DIRECTORIES
|
# SECURE FILES AND DIRECTORIES
|
||||||
#=================================================
|
#=================================================
|
||||||
|
|
||||||
chown -R $app:www-data $install_dir
|
chown -R ${app}:www-data $install_dir
|
||||||
chmod -R u=rwX,g=rX,o-rwx $install_dir
|
chmod -R u=rwX,g=rX,o-rwx $install_dir
|
||||||
chmod g-rwx $install_dir/wakka.config.php
|
chmod g-rwx $install_dir/wakka.config.php
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue