1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/lychee_ynh.git synced 2024-09-03 19:36:36 +02:00

Merge branch 'testing' into set---purge-data-dir

This commit is contained in:
Alexandre Aubin 2021-11-21 19:33:39 +01:00 committed by GitHub
commit 29bb0f55cf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 9 deletions

View file

@ -35,8 +35,6 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
#=================================================
ynh_script_progression --message="Validating restoration parameters..." --weight=1
ynh_webpath_available --domain=$domain --path_url=$path_url \
|| ynh_die --message="Path not available: ${domain}${path_url}"
test ! -d $final_path \
|| ynh_die --message="There is already a directory: $final_path "

View file

@ -86,6 +86,14 @@ ynh_script_progression --message="Making sure dedicated system user exists..." -
# Create a dedicated user (if not existing)
ynh_system_user_create --username=$app --home_dir="$final_path"
#=================================================
# CREATE DEDICATED USER
#=================================================
ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1
# Create a dedicated user (if not existing)
ynh_system_user_create --username=$app --home_dir="$final_path"
#=================================================
# DOWNLOAD, CHECK AND UNPACK SOURCE
#=================================================
@ -95,7 +103,7 @@ then
ynh_script_progression --message="Upgrading source files..." --weight=4
# Download, check integrity, uncompress and patch the source from app.src
ynh_setup_source --dest_dir="$final_path"
ynh_setup_source --dest_dir="$final_path" --keep="$final_path/.env $final_path/public/dist/user.css"
fi
chmod 750 "$final_path"
@ -139,9 +147,9 @@ ynh_install_composer --install_args="--ignore-platform-reqs"
ynh_script_progression --message="Setting $app config..."
# Setup application config
ynh_add_config --template="../conf/.env.example" --destination="$final_path/.env"
#ynh_add_config --template="../conf/.env.example" --destination="$final_path/.env"
ynh_add_config --template="../conf/user.css.example" --destination="$final_path/public/dist/user.css"
#ynh_add_config --template="../conf/user.css.example" --destination="$final_path/public/dist/user.css"
ynh_replace_string --match_string="\$ffmpeg = FFMpeg::create();" --replace_string="\$ffmpeg = FFMpeg::create(array(\
'ffmpeg.binaries' => '/usr/bin/ffmpeg',\
@ -153,13 +161,13 @@ ynh_replace_string --match_string="\$ffmpeg = FFMpeg::create();" --replace_strin
#=================================================
ynh_script_progression --message="Upgrading $app source files..." --weight=4
ynh_exec_warn_less ynh_composer_exec --commands=\"dump-autoload\"
ynh_exec_warn_less ynh_composer_exec --commands=dump-autoload
pushd $final_path
php$phpversion artisan key:generate
#php$phpversion artisan key:generate
php$phpversion artisan migrate -n --force
#php$phpversion artisan config:clear -n
#php$phpversion artisan config:cache -n
php$phpversion artisan config:clear -n
php$phpversion artisan config:cache -n
popd
#=================================================