From f4ece6dccdbcf03efaec68f4b58f5c5f326c132b Mon Sep 17 00:00:00 2001 From: tituspijean Date: Fri, 13 May 2022 23:28:52 +0200 Subject: [PATCH] Standardize app.src --- conf/app.src | 5 +++++ conf/app.src.default | 5 ----- scripts/install | 2 -- scripts/upgrade | 2 -- 4 files changed, 5 insertions(+), 9 deletions(-) create mode 100644 conf/app.src delete mode 100644 conf/app.src.default diff --git a/conf/app.src b/conf/app.src new file mode 100644 index 0000000..f95cc57 --- /dev/null +++ b/conf/app.src @@ -0,0 +1,5 @@ +SOURCE_URL=https://buildbot.libretro.com/stable/1.10.3/emscripten/RetroArch.7z +SOURCE_SUM=ccbed86baa1b7f6a92104c20ca9671124c15189dfddf76be641c7486c74fc1d2 +SOURCE_SUM_PRG=sha256sum +SOURCE_FORMAT=7z +SOURCE_EXTRACT=false diff --git a/conf/app.src.default b/conf/app.src.default deleted file mode 100644 index d8a311d..0000000 --- a/conf/app.src.default +++ /dev/null @@ -1,5 +0,0 @@ -SOURCE_URL=https://buildbot.libretro.com/stable/__UPSTREAM_VERSION__/emscripten/RetroArch.7z -SOURCE_SUM=a87c96995c9784485ea0686bcc5a37d334cf2e6a56106a80dc447bbfad9ffc98 -SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=7z -SOURCE_EXTRACT=false diff --git a/scripts/install b/scripts/install index c857d18..3bdc092 100755 --- a/scripts/install +++ b/scripts/install @@ -28,7 +28,6 @@ domain=$YNH_APP_ARG_DOMAIN path_url=$YNH_APP_ARG_PATH is_public=$YNH_APP_ARG_IS_PUBLIC app=$YNH_APP_INSTANCE_NAME -upstream_version=$(ynh_app_upstream_version) #================================================= # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS @@ -68,7 +67,6 @@ ynh_script_progression --message="Setting up source files..." --weight=60 ynh_app_setting_set --app=$app --key=final_path --value=$final_path # Download, check integrity, uncompress and patch the source from app.src # uncompress and patch done manually as 7z format is not supported -ynh_add_config --template="../conf/app.src.default" --destination="../conf/retroarch.src" ynh_setup_source --dest_dir="$final_path" --source_id=$app #7z archive not handled by ynh and no way to strip component, have to move it manually 7zr x $final_path/retroarch.7z -o$final_path diff --git a/scripts/upgrade b/scripts/upgrade index f7ea8e0..6513b63 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -15,7 +15,6 @@ source /usr/share/yunohost/helpers ynh_script_progression --message="Loading installation settings..." --weight=1 app=$YNH_APP_INSTANCE_NAME -upstream_version=$(ynh_app_upstream_version) domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path) @@ -52,7 +51,6 @@ then ynh_script_progression --message="Upgrading source files..." --weight=5 # Download, check integrity, uncompress and patch the source from app.src - ynh_add_config --template="../conf/app.src.default" --destination="../conf/retroarch.src" ynh_setup_source --dest_dir="$final_path" --source_id=$app #7z archive not handled by ynh and no way to strip component, have to move it manually 7zr x $final_path/retroarch.7z -o$final_path