From 3f044d81af896e1046ea5f5336e052fef767af48 Mon Sep 17 00:00:00 2001 From: Krakinou Date: Sun, 7 May 2023 18:10:21 +0200 Subject: [PATCH] Initial commit - script conversion --- conf/app.src | 6 ---- conf/indexer.sh | 6 ++-- conf/nginx.conf | 2 +- manifest.toml | 57 ++++++++++++++++++++++++++++++++++ scripts/_common.sh | 2 +- scripts/backup | 12 ++++---- scripts/change_url | 62 +++++++++++++++++++------------------ scripts/install | 76 +++++++++++++++++++++++----------------------- scripts/remove | 18 +++++------ scripts/restore | 34 ++++++++++----------- scripts/upgrade | 60 ++++++++++++++++++------------------ 11 files changed, 194 insertions(+), 141 deletions(-) delete mode 100644 conf/app.src create mode 100644 manifest.toml diff --git a/conf/app.src b/conf/app.src deleted file mode 100644 index fd9f6d8..0000000 --- a/conf/app.src +++ /dev/null @@ -1,6 +0,0 @@ -SOURCE_URL=https://buildbot.libretro.com/stable/1.15.0/emscripten/RetroArch.7z -SOURCE_SUM=ce4f8319850545478d9b18cb103de0234fc36a1b50788c82cfb0ca308e793914 -SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=7z -SOURCE_FILENAME=retroarch.7z -SOURCE_EXTRACT=false diff --git a/conf/indexer.sh b/conf/indexer.sh index 2c14573..187e6bd 100644 --- a/conf/indexer.sh +++ b/conf/indexer.sh @@ -15,15 +15,15 @@ source _common.sh #================================================= app=__APP__ -final_path=$(ynh_app_setting_get --app=$app --key=final_path) +install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) #================================================= # Update the index #================================================= ynh_use_nodejs -cd $final_path/assets/frontend/bundle/ +cd $install_dir/assets/frontend/bundle/ ../../../indexer > .index-xhr -cd $final_path/assets/cores +cd $install_dir/assets/cores ../../indexer > .index-xhr diff --git a/conf/nginx.conf b/conf/nginx.conf index 38e7e49..34e5264 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -2,7 +2,7 @@ location __PATH__/ { # Path to source - alias __FINALPATH__/ ; + alias __INSTALL_DIR__/ ; # Include SSOWAT user panel. diff --git a/manifest.toml b/manifest.toml new file mode 100644 index 0000000..fcd0a8e --- /dev/null +++ b/manifest.toml @@ -0,0 +1,57 @@ +packaging_format = 2 + +id = "retroarch" +name = "Retroarch Web Player" +description.en = "Emulate videogames system and play videogames through your web browser" +description.fr = "Emulez des consoles de jeux et jouer à ces jeux vidéos dans votre explorateur web" + +version = "1.15.0~ynh2" + +maintainers = ["Krakinou"] + +[upstream] +license = "GPL-3.0-or-later" +website = "http://www.retroarch.com/" +demo = "https://web.libretro.com/" +admindoc = "https://docs.libretro.com/" +userdoc = "https://docs.libretro.com/" +code = "https://github.com/libretro/RetroArch" +cpe = "???" # FIXME: optional but recommended if relevant, this is meant to contain the Common Platform Enumeration, which is sort of a standard id for applications defined by the NIST. In particular, Yunohost may use this is in the future to easily track CVE (=security reports) related to apps. The CPE may be obtained by searching here: https://nvd.nist.gov/products/cpe/search. For example, for Nextcloud, the CPE is 'cpe:2.3:a:nextcloud:nextcloud' (no need to include the version number) +fund = "???" # FIXME: optional but recommended (or remove if irrelevant / not applicable). This is meant to be an URL where people can financially support this app, especially when its development is based on volunteers and/or financed by its community. YunoHost may later advertise it in the webadmin. + +[integration] +yunohost = ">= 11.1.15" +architectures = "all" # FIXME: can be replaced by a list of supported archs using the dpkg --print-architecture nomenclature (amd64/i386/armhf/arm64), for example: ["amd64", "i386"] +multi_instance = false +ldap = "?" # FIXME: replace with true, false, or "not_relevant". Not to confuse with the "sso" key : the "ldap" key corresponds to wether or not a user *can* login on the app using its YunoHost credentials. +sso = "?" # FIXME: replace with true, false, or "not_relevant". Not to confuse with the "ldap" key : the "sso" key corresponds to wether or not a user is *automatically logged-in* on the app when logged-in on the YunoHost portal. +disk = "50M" # FIXME: replace with an **estimate** minimum disk requirement. e.g. 20M, 400M, 1G, ... +ram.build = "50M" # FIXME: replace with an **estimate** minimum ram requirement. e.g. 50M, 400M, 1G, ... +ram.runtime = "50M" # FIXME: replace with an **estimate** minimum ram requirement. e.g. 50M, 400M, 1G, ... + +[install] + [install.domain] + # this is a generic question - ask strings are automatically handled by Yunohost's core + type = "domain" + + [install.path] + # this is a generic question - ask strings are automatically handled by Yunohost's core + type = "path" + default = "/retroarch" + + [install.init_main_permission] + help.en = "Yes will allow everyone to access the app without login to yunohost instance first" + help.fr = "Oui autorisera n'importe qui à accéder à l'application sans s'identifier dans Yunohost" + type = "group" + default = "visitors" + +[resources] + [resources.system_user] + + [resources.install_dir] + + [resources.permissions] + main.url = "/" + + [resources.apt] + packages = "p7zip" diff --git a/scripts/_common.sh b/scripts/_common.sh index 3e8a58d..6605f76 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,7 +5,7 @@ #================================================= # dependencies used by the app -pkg_dependencies="p7zip" +#REMOVEME? pkg_dependencies="p7zip" nodejs_version=10 diff --git a/scripts/backup b/scripts/backup index d43ba24..ce93a9f 100755 --- a/scripts/backup +++ b/scripts/backup @@ -15,17 +15,17 @@ source /usr/share/yunohost/helpers #================================================= # Exit if an error occurs during the execution of the script -ynh_abort_if_errors +#REMOVEME? ynh_abort_if_errors #================================================= # LOAD SETTINGS #================================================= -ynh_print_info --message="Loading installation settings..." +#REMOVEME? ynh_print_info --message="Loading installation settings..." -app=$YNH_APP_INSTANCE_NAME +#REMOVEME? app=$YNH_APP_INSTANCE_NAME -final_path=$(ynh_app_setting_get --app=$app --key=final_path) -domain=$(ynh_app_setting_get --app=$app --key=domain) +#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) +#REMOVEME? domain=$(ynh_app_setting_get --app=$app --key=domain) #================================================= # DECLARE DATA AND CONF FILES TO BACKUP @@ -36,7 +36,7 @@ ynh_print_info --message="Declaring files to be backed up..." # BACKUP THE APP MAIN DIR #================================================= -ynh_backup --src_path="$final_path" +ynh_backup --src_path="$install_dir" #================================================= # BACKUP THE NGINX CONFIGURATION diff --git a/scripts/change_url b/scripts/change_url index a4f70a9..b8c7ec8 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -13,53 +13,53 @@ source /usr/share/yunohost/helpers # RETRIEVE ARGUMENTS #================================================= -old_domain=$YNH_APP_OLD_DOMAIN -old_path=$YNH_APP_OLD_PATH +#REMOVEME? old_domain=$YNH_APP_OLD_DOMAIN +#REMOVEME? old_path=$YNH_APP_OLD_PATH -new_domain=$YNH_APP_NEW_DOMAIN -new_path=$YNH_APP_NEW_PATH +#REMOVEME? new_domain=$YNH_APP_NEW_DOMAIN +#REMOVEME? new_path=$YNH_APP_NEW_PATH -app=$YNH_APP_INSTANCE_NAME +#REMOVEME? app=$YNH_APP_INSTANCE_NAME #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --weight=1 +#REMOVEME? ynh_script_progression --message="Loading installation settings..." --weight=1 -# Needed for helper "ynh_add_nginx_config" -final_path=$(ynh_app_setting_get --app=$app --key=final_path) +#REMOVEME? # Needed for helper "ynh_add_nginx_config" +#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) #================================================= # BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP #================================================= -ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --weight=10 +#REMOVEME? ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --weight=10 # Backup the current version of the app -ynh_backup_before_upgrade -ynh_clean_setup () { +#REMOVEME? ynh_backup_before_upgrade +#REMOVEME? ynh_clean_setup () { # Remove the new domain config file, the remove script won't do it as it doesn't know yet its location. - ynh_secure_remove --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" +#REMOVEME? ynh_secure_remove --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" # Restore it if the upgrade fails - ynh_restore_upgradebackup +#REMOVEME? ynh_restore_upgradebackup } # Exit if an error occurs during the execution of the script -ynh_abort_if_errors +#REMOVEME? ynh_abort_if_errors #================================================= # CHECK WHICH PARTS SHOULD BE CHANGED #================================================= -change_domain=0 -if [ "$old_domain" != "$new_domain" ] +#REMOVEME? change_domain=0 +#REMOVEME? if [ "$old_domain" != "$new_domain" ] then - change_domain=1 + #REMOVEME? change_domain=1 fi -change_path=0 -if [ "$old_path" != "$new_path" ] +#REMOVEME? change_path=0 +#REMOVEME? if [ "$old_path" != "$new_path" ] then - change_path=1 + #REMOVEME? change_path=1 fi #================================================= @@ -69,28 +69,30 @@ fi #================================================= ynh_script_progression --message="Updating NGINX web server configuration..." --weight=1 -nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf +ynh_change_url_nginx_config + +#REMOVEME? nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf # Change the path in the NGINX config file if [ $change_path -eq 1 ] then # Make a backup of the original NGINX config file if modified - ynh_backup_if_checksum_is_different --file="$nginx_conf_path" +#REMOVEME? ynh_backup_if_checksum_is_different --file="$nginx_conf_path" # Set global variables for NGINX helper - domain="$old_domain" - path_url="$new_path" +#REMOVEME? domain="$old_domain" +#REMOVEME? path="$new_path" # Create a dedicated NGINX config - ynh_add_nginx_config +#REMOVEME? ynh_add_nginx_config fi # Change the domain for NGINX if [ $change_domain -eq 1 ] then # Delete file checksum for the old conf file location - ynh_delete_file_checksum --file="$nginx_conf_path" - mv $nginx_conf_path /etc/nginx/conf.d/$new_domain.d/$app.conf +#REMOVEME? ynh_delete_file_checksum --file="$nginx_conf_path" +#REMOVEME? mv $nginx_conf_path /etc/nginx/conf.d/$new_domain.d/$app.conf # Store file checksum for the new config file location - ynh_store_file_checksum --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" +#REMOVEME? ynh_store_file_checksum --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" fi #================================================= @@ -98,9 +100,9 @@ fi #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading NGINX web server..." --weight=1 +#REMOVEME? ynh_script_progression --message="Reloading NGINX web server..." --weight=1 -ynh_systemd_action --service_name=nginx --action=reload +#REMOVEME? #REMOVEME? ynh_systemd_action --service_name=nginx --action=reload #================================================= # END OF SCRIPT diff --git a/scripts/install b/scripts/install index c3ef6e1..d4974bf 100755 --- a/scripts/install +++ b/scripts/install @@ -14,66 +14,66 @@ source /usr/share/yunohost/helpers #================================================= # Exit if an error occurs during the execution of the script -ynh_abort_if_errors +#REMOVEME? ynh_abort_if_errors #================================================= # RETRIEVE ARGUMENTS FROM THE MANIFEST #================================================= -domain=$YNH_APP_ARG_DOMAIN -path_url=$YNH_APP_ARG_PATH -is_public=$YNH_APP_ARG_IS_PUBLIC -app=$YNH_APP_INSTANCE_NAME +#REMOVEME? domain=$YNH_APP_ARG_DOMAIN +#REMOVEME? path=$YNH_APP_ARG_PATH +#REMOVEME? is_public=$YNH_APP_ARG_IS_PUBLIC +#REMOVEME? app=$YNH_APP_INSTANCE_NAME #================================================= # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS #================================================= -ynh_script_progression --message="Validating installation parameters..." --weight=1 +#REMOVEME? ynh_script_progression --message="Validating installation parameters..." --weight=1 -final_path=/opt/yunohost/$app -test ! -e "$final_path" || ynh_die --message="This path already contains a folder" +#REMOVEME? install_dir=/opt/yunohost/$app +#REMOVEME? test ! -e "$install_dir" || ynh_die --message="This path already contains a folder" # Register (book) web path -ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url +#REMOVEME? ynh_webpath_register --app=$app --domain=$domain --path=$path #================================================= # STORE SETTINGS FROM MANIFEST #================================================= -ynh_script_progression --message="Storing installation settings..." --weight=1 +#REMOVEME? ynh_script_progression --message="Storing installation settings..." --weight=1 -ynh_app_setting_set --app=$app --key=domain --value=$domain -ynh_app_setting_set --app=$app --key=path --value=$path_url +#REMOVEME? ynh_app_setting_set --app=$app --key=domain --value=$domain +#REMOVEME? ynh_app_setting_set --app=$app --key=path --value=$path #================================================= # INSTALL DEPENDENCIES #================================================= -ynh_script_progression --message="Installing dependencies..." --weight=13 +#REMOVEME? ynh_script_progression --message="Installing dependencies..." --weight=13 ynh_install_nodejs --nodejs_version=$nodejs_version ynh_use_nodejs ynh_npm install -g coffeescript -ynh_install_app_dependencies $pkg_dependencies +#REMOVEME? ynh_install_app_dependencies $pkg_dependencies #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= ynh_script_progression --message="Setting up source files..." --weight=60 -ynh_app_setting_set --app=$app --key=final_path --value=$final_path +#REMOVEME? ynh_app_setting_set --app=$app --key=install_dir --value=$install_dir # Download, check integrity, uncompress and patch the source from app.src # uncompress and patch done manually as 7z format is not supported -ynh_setup_source --dest_dir="$final_path" +ynh_setup_source --dest_dir="$install_dir" #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 -mv $final_path/retroarch/* $final_path/ -ynh_secure_remove --file="$final_path/retroarch.7z" -ynh_secure_remove --file="$final_path/retroarch" +7zr x $install_dir/retroarch.7z -o$install_dir +mv $install_dir/retroarch/* $install_dir/ +#REMOVEME? ynh_secure_remove --file="$install_dir/retroarch.7z" +#REMOVEME? ynh_secure_remove --file="$install_dir/retroarch" -touch $final_path/analytics.js #https://github.com/libretro/RetroArch/issues/4539#issuecomment-473345195 +touch $install_dir/analytics.js #https://github.com/libretro/RetroArch/issues/4539#issuecomment-473345195 #Get the indexer as exe so that folder w/ ROMs can be indexed -chmod +x $final_path/indexer +chmod +x $install_dir/indexer #================================================= #SETTING MULTIMEDIA DIRECTORY @@ -81,17 +81,17 @@ chmod +x $final_path/indexer ynh_script_progression --message="Setting up Multimedia directory..." --weight=9 ynh_multimedia_build_main_dir -mkdir -p $final_path/assets/cores/Game -ynh_multimedia_addfolder --source_dir="$final_path/assets/cores/Game" --dest_dir="/share/Game" -ynh_add_config --template="../conf/README.GAME" --destination="$final_path/assets/cores/Game/README" -chmod 666 $final_path/assets/cores/Game/README +mkdir -p $install_dir/assets/cores/Game +ynh_multimedia_addfolder --source_dir="$install_dir/assets/cores/Game" --dest_dir="/share/Game" +ynh_add_config --template="../conf/README.GAME" --destination="$install_dir/assets/cores/Game/README" +chmod 666 $install_dir/assets/cores/Game/README # SETUP CRON FILE FOR INDEXER #setup indexer bash script -ynh_add_config --template="../conf/indexer.sh" --destination="$final_path/indexer.sh" -chown www-data: $final_path/indexer.sh -chmod 744 $final_path/indexer.sh +ynh_add_config --template="../conf/indexer.sh" --destination="$install_dir/indexer.sh" +chown www-data: $install_dir/indexer.sh +chmod 744 $install_dir/indexer.sh #setup cron file cron_path="/etc/cron.d/$app" @@ -120,19 +120,19 @@ ynh_add_nginx_config ### that really need such authorization. # Set permissions to app files -chown -R www-data: $final_path +chown -R www-data: $install_dir # Requested so that multimedia group can see the Game folder : all parent folder should be readable by others -chmod 751 $final_path +chmod 751 $install_dir #================================================= # SETUP SSOWAT #================================================= -ynh_script_progression --message="Configuring permissions..." --weight=1 +#REMOVEME? ynh_script_progression --message="Configuring permissions..." --weight=1 # Make app public if necessary -if [ $is_public -eq 1 ] +#REMOVEME? if [ $is_public -eq 1 ] then - ynh_permission_update --permission "main" --add visitors +#REMOVEME? ynh_permission_update --permission "main" --add visitors fi #================================================= @@ -143,17 +143,17 @@ fi #Indexer will list the available ROM and cores for Retroarch ynh_script_progression --message="Setup Indexer for content..." --weight=3 -cd $final_path/assets/frontend/bundle/ +cd $install_dir/assets/frontend/bundle/ ../../../indexer > .index-xhr -cd $final_path/assets/cores +cd $install_dir/assets/cores ../../indexer > .index-xhr #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading NGINX web server..." --weight=1 +#REMOVEME? ynh_script_progression --message="Reloading NGINX web server..." --weight=1 -ynh_systemd_action --service_name=nginx --action=reload +#REMOVEME? ynh_systemd_action --service_name=nginx --action=reload #================================================= diff --git a/scripts/remove b/scripts/remove index c438dea..edfd3ab 100755 --- a/scripts/remove +++ b/scripts/remove @@ -12,23 +12,23 @@ source /usr/share/yunohost/helpers #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --weight=1 +#REMOVEME? ynh_script_progression --message="Loading installation settings..." --weight=1 -app=$YNH_APP_INSTANCE_NAME +#REMOVEME? app=$YNH_APP_INSTANCE_NAME -domain=$(ynh_app_setting_get --app=$app --key=domain) -final_path=$(ynh_app_setting_get --app=$app --key=final_path) +#REMOVEME? domain=$(ynh_app_setting_get --app=$app --key=domain) +#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) #================================================= # REMOVE DEPENDENCIES #================================================= -ynh_script_progression --message="Removing dependencies..." --weight=7 +#REMOVEME? ynh_script_progression --message="Removing dependencies..." --weight=7 # Remove metapackage and its dependencies ynh_use_nodejs ynh_npm uninstall -g coffeescript ynh_remove_nodejs -ynh_remove_app_dependencies +#REMOVEME? ynh_remove_app_dependencies #================================================= # REMOVE CRONJOB @@ -47,10 +47,10 @@ ynh_secure_remove --file="/home/yunohost.multimedia/share/Game" #================================================= # REMOVE APP MAIN DIR #================================================= -ynh_script_progression --message="Removing app main directory..." --weight=1 +#REMOVEME? ynh_script_progression --message="Removing app main directory..." --weight=1 # Remove the app directory securely -ynh_secure_remove --file="$final_path" +#REMOVEME? ynh_secure_remove --file="$install_dir" #================================================= # REMOVE NGINX CONFIGURATION @@ -59,7 +59,7 @@ ynh_script_progression --message="Removing NGINX web server configuration..." -- # Remove the dedicated nginx config ynh_remove_nginx_config -if [ "$(ynh_app_setting_get --app=$app --key=checksum__etc_nginx_mime.types)" == "$(md5sum "/etc/nginx/mime.types" | cut -d ' ' -f 1)" ]; then +#REMOVEME? if [ "$(ynh_app_setting_get --app=$app --key=checksum__etc_nginx_mime.types)" == "$(md5sum "/etc/nginx/mime.types" | cut -d ' ' -f 1)" ]; then #file has not changed, restore the previous mime.type rm /etc/nginx/mime.types mv /etc/nginx/mime.types.$app /etc/nginx/mime.types diff --git a/scripts/restore b/scripts/restore index 1087b35..026101f 100755 --- a/scripts/restore +++ b/scripts/restore @@ -15,26 +15,26 @@ source /usr/share/yunohost/helpers #================================================= # Exit if an error occurs during the execution of the script -ynh_abort_if_errors +#REMOVEME? ynh_abort_if_errors #================================================= # LOAD SETTINGS #================================================= ynh_script_progression --message="Loading settings..." --weight=1 -app=$YNH_APP_INSTANCE_NAME +#REMOVEME? app=$YNH_APP_INSTANCE_NAME -domain=$(ynh_app_setting_get --app=$app --key=domain) -path_url=$(ynh_app_setting_get --app=$app --key=path) -final_path=$(ynh_app_setting_get --app=$app --key=final_path) +#REMOVEME? domain=$(ynh_app_setting_get --app=$app --key=domain) +#REMOVEME? path=$(ynh_app_setting_get --app=$app --key=path) +#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) #================================================= # CHECK IF THE APP CAN BE RESTORED #================================================= -ynh_script_progression --message="Validating restoration parameters..." --weight=1 +#REMOVEME? ynh_script_progression --message="Validating restoration parameters..." --weight=1 -test ! -d $final_path \ - || ynh_die --message="There is already a directory: $final_path " +#REMOVEME? test ! -d $install_dir \ + || ynh_die --message="There is already a directory: $install_dir " #================================================= # STANDARD RESTORATION STEPS @@ -58,27 +58,27 @@ fi #================================================= ynh_script_progression --message="Restoring the app main directory..." --weight=1 -ynh_restore_file --origin_path="$final_path" +ynh_restore_file --origin_path="$install_dir" #================================================= # RESTORE USER RIGHTS #================================================= # Restore permissions on app files -chown -R www-data: $final_path +chown -R www-data: $install_dir # Requested so that multimedia group can see the Game folder : all parent folder should be readable by others -chmod 751 $final_path +chmod 751 $install_dir #================================================= # SPECIFIC RESTORATION #================================================= # REINSTALL DEPENDENCIES #================================================= -ynh_script_progression --message="Reinstalling dependencies..." --weight=5 +#REMOVEME? ynh_script_progression --message="Reinstalling dependencies..." --weight=5 # Define and install dependencies #Dependencies are not really required as this is just to unzip the 7z file -ynh_install_app_dependencies $pkg_dependencies +#REMOVEME? ynh_install_app_dependencies $pkg_dependencies #However, npm IS required to run the coffeescript ynh_install_nodejs --nodejs_version=10 ynh_use_nodejs @@ -90,10 +90,10 @@ ynh_npm install -g coffeescript ynh_script_progression --message="Setting up Multimedia directory..." --weight=5 ynh_multimedia_build_main_dir -mkdir -p $final_path/assets/cores/Game -ynh_multimedia_addfolder --source_dir="$final_path/assets/cores/Game" --dest_dir="/share/Game" -ynh_add_config --template="../conf/README.GAME" --destination="$final_path/assets/cores/Game/README" -chmod 666 $final_path/assets/cores/Game/README +mkdir -p $install_dir/assets/cores/Game +ynh_multimedia_addfolder --source_dir="$install_dir/assets/cores/Game" --dest_dir="/share/Game" +ynh_add_config --template="../conf/README.GAME" --destination="$install_dir/assets/cores/Game/README" +chmod 666 $install_dir/assets/cores/Game/README #================================================= # RESTORE THE CRON FILE diff --git a/scripts/upgrade b/scripts/upgrade index 1bb66ff..0e76627 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -12,13 +12,13 @@ source /usr/share/yunohost/helpers #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --weight=1 +#REMOVEME? ynh_script_progression --message="Loading installation settings..." --weight=1 -app=$YNH_APP_INSTANCE_NAME +#REMOVEME? app=$YNH_APP_INSTANCE_NAME -domain=$(ynh_app_setting_get --app=$app --key=domain) -path_url=$(ynh_app_setting_get --app=$app --key=path) -final_path=$(ynh_app_setting_get --app=$app --key=final_path) +#REMOVEME? domain=$(ynh_app_setting_get --app=$app --key=domain) +#REMOVEME? path=$(ynh_app_setting_get --app=$app --key=path) +#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) #================================================= # CHECK VERSION @@ -29,16 +29,16 @@ upgrade_type=$(ynh_check_app_version_changed) #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= -ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=10 +#REMOVEME? ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=10 # Backup the current version of the app -ynh_backup_before_upgrade -ynh_clean_setup () { +#REMOVEME? ynh_backup_before_upgrade +#REMOVEME? ynh_clean_setup () { # Restore it if the upgrade fails - ynh_restore_upgradebackup +#REMOVEME? ynh_restore_upgradebackup } # Exit if an error occurs during the execution of the script -ynh_abort_if_errors +#REMOVEME? ynh_abort_if_errors #================================================= # STANDARD UPGRADE STEPS @@ -51,24 +51,24 @@ then ynh_script_progression --message="Upgrading source files..." --weight=5 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$final_path" + ynh_setup_source --dest_dir="$install_dir" #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 + 7zr x $install_dir/retroarch.7z -o$install_dir #mv not working as target directory is not empty - cp -R $final_path/retroarch/* $final_path/ - ynh_secure_remove --file="$final_path/retroarch.7z" - ynh_secure_remove --file="$final_path/retroarch" - touch $final_path/analytics.js #https://github.com/libretro/RetroArch/issues/4539#issuecomment-473345195 + cp -R $install_dir/retroarch/* $install_dir/ +#REMOVEME? ynh_secure_remove --file="$install_dir/retroarch.7z" +#REMOVEME? ynh_secure_remove --file="$install_dir/retroarch" + touch $install_dir/analytics.js #https://github.com/libretro/RetroArch/issues/4539#issuecomment-473345195 #Get the indexer as exe so that folder w/ ROMs can be indexed - chmod +x $final_path/indexer + chmod +x $install_dir/indexer fi # SETUP CRON FILE FOR INDEXER #setup indexer bash script -ynh_add_config --template="../conf/indexer.sh" --destination="$final_path/indexer.sh" -chown www-data: $final_path/indexer.sh -chmod 744 $final_path/indexer.sh +ynh_add_config --template="../conf/indexer.sh" --destination="$install_dir/indexer.sh" +chown www-data: $install_dir/indexer.sh +chmod 744 $install_dir/indexer.sh #setup cron file cron_path="/etc/cron.d/$app" ynh_add_config --template="../conf/retroarch.cron" --destination="$cron_path" @@ -81,10 +81,10 @@ chmod 644 "$cron_path" ynh_script_progression --message="Setting up Multimedia directory..." --weight=4 ynh_multimedia_build_main_dir -mkdir -p $final_path/assets/cores/Game -ynh_multimedia_addfolder --source_dir="$final_path/assets/cores/Game" --dest_dir="/share/Game" -ynh_add_config --template="../conf/README.GAME" --destination="$final_path/assets/cores/Game/README" -chmod 666 $final_path/assets/cores/Game/README +mkdir -p $install_dir/assets/cores/Game +ynh_multimedia_addfolder --source_dir="$install_dir/assets/cores/Game" --dest_dir="/share/Game" +ynh_add_config --template="../conf/README.GAME" --destination="$install_dir/assets/cores/Game/README" +chmod 666 $install_dir/assets/cores/Game/README #================================================= # NGINX CONFIGURATION @@ -97,11 +97,11 @@ ynh_add_nginx_config #================================================= # UPGRADE DEPENDENCIES #================================================= -ynh_script_progression --message="Upgrading dependencies..." --weight=20 +#REMOVEME? ynh_script_progression --message="Upgrading dependencies..." --weight=20 # Define and install dependencies #Dependencies are not really required as this is just to unzip the 7z file -ynh_install_app_dependencies $pkg_dependencies +#REMOVEME? ynh_install_app_dependencies $pkg_dependencies #However, npm IS required to run the coffeescript ynh_install_nodejs --nodejs_version=$nodejs_version ynh_use_nodejs @@ -113,16 +113,16 @@ ynh_npm install -g coffeescript # Set permissions on app files #================================================= -chown -R www-data: $final_path +chown -R www-data: $install_dir # Requested so that multimedia group can see the Game folder : all parent folder should be readable by others -chmod 751 $final_path +chmod 751 $install_dir #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading NGINX web server..." --weight=1 +#REMOVEME? ynh_script_progression --message="Reloading NGINX web server..." --weight=1 -ynh_systemd_action --service_name=nginx --action=reload +#REMOVEME? ynh_systemd_action --service_name=nginx --action=reload #================================================= # END OF SCRIPT