From 64bc52cf63429e91bc4a619b20e1344217d4b675 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Mon, 25 Mar 2019 08:28:55 +0100 Subject: [PATCH] Fix version --- conf/app.src | 6 ++++++ scripts/install | 9 ++------- scripts/upgrade | 13 +------------ 3 files changed, 9 insertions(+), 19 deletions(-) create mode 100644 conf/app.src diff --git a/conf/app.src b/conf/app.src new file mode 100644 index 0000000..07ccbf9 --- /dev/null +++ b/conf/app.src @@ -0,0 +1,6 @@ +SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/archive/v0.9.999/pleroma-v0.9.999.tar.gz +SOURCE_SUM=bab2cb3a13691a4291562d1691d55dc94226756f05a2a7c7053b234339ee00f8 +SOURCE_SUM_PRG=sha256sum +SOURCE_FORMAT=tar.gz +SOURCE_IN_SUBDIR=true +SOURCE_FILENAME= diff --git a/scripts/install b/scripts/install index e6bcc44..dde41c0 100755 --- a/scripts/install +++ b/scripts/install @@ -37,7 +37,7 @@ size=$YNH_APP_ARG_SIZE random_key=$(ynh_string_random 64) admin_email=$(ynh_user_get_info $admin 'mail') -## Bypass package_checker name not compatible with writefreely +## Bypass package_checker name not compatible with pleroma if [ "$admin" = "package_checker" ] then admin="test" @@ -84,8 +84,6 @@ ynh_print_info "Configuring firewall ..." # Find a free port port=$(ynh_find_port 8095) -# Open this port -#ynh_exec_warn_less yunohost firewall allow --no-upnp TCP $port ynh_app_setting_set $app port $port #================================================= @@ -135,10 +133,7 @@ ynh_print_info "Setting up source files ..." ynh_app_setting_set $app final_path $final_path # Download, check integrity, uncompress and patch the source from app.src -git clone https://git.pleroma.social/pleroma/pleroma "$final_path/$app" -pushd $final_path/$app - git checkout -b master -popd +ynh_setup_source "$final_path/$app" #================================================= # NGINX CONFIGURATION diff --git a/scripts/upgrade b/scripts/upgrade index 4042e1d..65aa1ad 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -59,9 +59,6 @@ if [ -z $final_path ]; then ynh_app_setting_set $app final_path $final_path fi -# Remove repository -ynh_secure_remove "/etc/apt/sources.list.d/erlang-solutions.list" - #Switch variables name psql_db=$(ynh_app_setting_get "$app" psql_db) @@ -119,14 +116,7 @@ path_url=$(ynh_normalize_url_path $path_url) ynh_print_info "Upgrading source files..." # Download, check integrity, uncompress and patch the source from app.src -#ynh_setup_source "$final_path" - -git clone --quiet https://git.pleroma.social/pleroma/pleroma "$final_path/upgrade" -pushd "$final_path/upgrade" - git checkout -b master -popd -cp -a "$final_path/upgrade/." "$final_path/$app/." -rm -r "$final_path/upgrade" +ynh_setup_source "$final_path/$app" #================================================= # NGINX CONFIGURATION @@ -240,7 +230,6 @@ ynh_add_systemd_config # Set permissions on app files chown -R "$app":"$app" "$final_path" - #================================================= # SETUP SSOWAT #=================================================