diff --git a/scripts/install b/scripts/install index e0c43d8..6e55c2f 100755 --- a/scripts/install +++ b/scripts/install @@ -125,7 +125,7 @@ ynh_install_composer --install_args="--ignore-platform-reqs" #================================================= # BUILDING #================================================= -ynh_script_progression --message="Building..." +ynh_script_progression --message="Building..." --weight=10 # Setup application config ynh_add_config --template="../conf/.env.example" --destination="$final_path/.env" diff --git a/scripts/upgrade b/scripts/upgrade index 884d63d..8062961 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -23,7 +23,6 @@ public_path=$(ynh_app_setting_get --app=$app --key=public_path) db_name=$(ynh_app_setting_get --app=$app --key=db_name) db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) phpversion=$YNH_PHP_VERSION -version=ynh_app_upstream_version #================================================= # CHECK VERSION @@ -62,8 +61,8 @@ if [ -z "$final_path" ]; then ynh_app_setting_set --app=$app --key=final_path --value=$final_path fi -# If public_path doesn't exist, create it -if [ -z "$public_path" ]; then +# If new public_path doesn't exist, create it +if [ -z "/home/yunohost.app/$app" ]; then public_path=/home/yunohost.app/$app mkdir -p $public_path chmod 755 $public_path diff --git a/sources/app-00-ffmpeg.patch b/sources/app-00-ffmpeg.patch deleted file mode 100644 index 336b9f3..0000000 --- a/sources/app-00-ffmpeg.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/app/Actions/Photo/Extensions/VideoEditing.php b/app/Actions/Photo/Extensions/VideoEditing.php -index 1a96769..5842606 100644 ---- a/app/Actions/Photo/Extensions/VideoEditing.php -+++ b/app/Actions/Photo/Extensions/VideoEditing.php -@@ -45,7 +45,10 @@ trait VideoEditing - /** - * ! check if we can use path instead of this ugly thing. - */ -- $ffmpeg = FFMpeg::create(); -+ $ffmpeg = FFMpeg::create(array( -+ 'ffmpeg.binaries' => '/usr/bin/ffmpeg', -+ 'ffprobe.binaries' => '/usr/bin/ffprobe', -+ )); - /** @var Video */ - $video = $ffmpeg->open(Storage::path('big/' . $photo->url)); - if (!($tmp = tempnam(sys_get_temp_dir(), 'lychee')) ||