From 5701ab4342a67080ce5b36b52cb7eb1a5d75bb3a Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Fri, 14 Jun 2024 23:15:59 +0200 Subject: [PATCH] use 'armhf' instead of 'armv6/7' (#147) Co-authored-by: yunohost-bot Co-authored-by: rosbeef andino --- manifest.toml | 9 +++------ scripts/_common.sh | 20 -------------------- scripts/install | 3 --- scripts/restore | 3 --- scripts/upgrade | 3 --- 5 files changed, 3 insertions(+), 35 deletions(-) diff --git a/manifest.toml b/manifest.toml index 4579954..1254ec3 100644 --- a/manifest.toml +++ b/manifest.toml @@ -105,17 +105,14 @@ i386.url = "https://github.com/superseriousbusiness/gotosocial/releases/download i386.sha256 = "7c5158f010b752a559aa3446bf28920bb8d9542109ba94c2a33cf907b3058504" amd64.url = "https://github.com/superseriousbusiness/gotosocial/releases/download/v0.15.0/gotosocial_0.15.0_linux_amd64.tar.gz" amd64.sha256 = "7819586a54869b2bfa2b27fbb2746f97e7eaa06f19fd154c7f2ad34aea3188d3" -armv6.url = "https://github.com/superseriousbusiness/gotosocial/releases/download/v0.15.0/gotosocial_0.15.0_linux_armv6.tar.gz" -armv6.sha256 = "dadce2162d336b61b84da7ca137a5bc8c613f2f982dcb3f68a50112ca582b117" -armv7.url = "https://github.com/superseriousbusiness/gotosocial/releases/download/v0.15.0/gotosocial_0.15.0_linux_armv7.tar.gz" -armv7.sha256 = "50bb887000f98030c0fa1aab60cd11ceaa986e3debd315ddb5a8dfdee2b502d2" +armhf.url = "https://github.com/superseriousbusiness/gotosocial/releases/download/v0.15.0/gotosocial_0.15.0_linux_armv7.tar.gz" +armhf.sha256 = "50bb887000f98030c0fa1aab60cd11ceaa986e3debd315ddb5a8dfdee2b502d2" arm64.url = "https://github.com/superseriousbusiness/gotosocial/releases/download/v0.15.0/gotosocial_0.15.0_linux_arm64.tar.gz" arm64.sha256 = "6c9f49da974bdad6d40a269e43cbfd8a62f6d8b3c8497d35b1c2a41128b523c0" autoupdate.asset.i386 = "gotosocial_.*linux_386.tar.gz$" autoupdate.asset.amd64 = "gotosocial_.*linux_amd64.tar.gz$" -autoupdate.asset.armv6 = "gotosocial_.*linux_armv6.tar.gz$" -autoupdate.asset.armv7 = "gotosocial_.*linux_armv7.tar.gz$" +autoupdate.asset.armhf = "gotosocial_.*linux_armv7.tar.gz$" autoupdate.asset.arm64 = "gotosocial_.*linux_arm64.tar.gz$" autoupdate.strategy = "latest_github_release" diff --git a/scripts/_common.sh b/scripts/_common.sh index a8bdbb9..ebb9161 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -8,26 +8,6 @@ # PERSONAL HELPERS #================================================= -# custom function to detect armv6 and armv7 -# ($YNH_ARCH returns armhf for both...) -detect_arch(){ - local architecture - if uname -m | grep -q -E "arm64|aarch64" ; then - architecture="arm64" - elif uname -m | grep -q "64" ; then - architecture="amd64" - elif uname -m | grep -q "86" ; then - architecture="i386" - elif uname -m | grep -q "armv6" ; then - architecture="armv6" - elif uname -m | grep -q "armv7" ; then - architecture="armv7" - else - ynh_die --message="The script can't identify a valid architecture. Please report this error." - fi - echo $architecture -} - # custom function to change bash bool 0/1 to false/true convert_bool(){ (("$1")) && echo "true" || echo "false" diff --git a/scripts/install b/scripts/install index 980c26e..7ecfe6e 100755 --- a/scripts/install +++ b/scripts/install @@ -157,9 +157,6 @@ ynh_script_progression --message="Setting up source files..." --weight=1 ### downloaded from an upstream source, like a git repository. ### `ynh_setup_source` use the file conf/app.src -# detect_arch comes from _common.sh / personnal helpers -architecture=$(detect_arch) - # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir" diff --git a/scripts/restore b/scripts/restore index b6c8bee..2170b88 100755 --- a/scripts/restore +++ b/scripts/restore @@ -67,9 +67,6 @@ ynh_psql_connect_as --user="$db_user" --password="$db_pwd" --database="$db_name" #================================================= ynh_script_progression --message="Setting up source files..." --weight=1 -# detect_arch comes from _common.sh / personnal helpers -architecture="$(detect_arch)" - # compare if the system arch is different from the binary arch # if so, download the correct binary if [ "$architecture" != "$(file "$install_dir"/gotosocial | cut -d ',' -f 2 | tr -d ' ')" ] diff --git a/scripts/upgrade b/scripts/upgrade index 759b680..7dd22f2 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -287,9 +287,6 @@ fi if [ "$upgrade_type" == "UPGRADE_APP" ] then ynh_script_progression --message="Upgrading source files..." - - # detect_arch comes from _common.sh / personnal helpers - architecture=$(detect_arch) # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir" --full_replace=1 --keep="config.yaml"