From 845b0164c8ed8098d4c92b66a9b103907b1daadc Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sun, 3 Mar 2019 14:15:18 +0100 Subject: [PATCH] switch source from release file to repository master --- conf/app.src | 6 ------ scripts/install | 5 ++++- scripts/upgrade | 7 ++++++- 3 files changed, 10 insertions(+), 8 deletions(-) delete mode 100755 conf/app.src diff --git a/conf/app.src b/conf/app.src deleted file mode 100755 index 9cfa69e..0000000 --- a/conf/app.src +++ /dev/null @@ -1,6 +0,0 @@ -SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/archive/master/pleroma-master.tar.gz -SOURCE_SUM=6fb0cd549c8d31a3cddc2244f05b6e01d1927b27e101f7a09b031370d84433a1 -SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=tar.gz -SOURCE_IN_SUBDIR=true -SOURCE_FILENAME= diff --git a/scripts/install b/scripts/install index 1dfa170..253589d 100755 --- a/scripts/install +++ b/scripts/install @@ -174,7 +174,10 @@ 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 -ynh_setup_source "$final_path/$app" +git clone https://git.pleroma.social/pleroma/pleroma "$final_path/$app" +pushd $final_path/$app + git checkout -b master +popd #================================================= # NGINX CONFIGURATION diff --git a/scripts/upgrade b/scripts/upgrade index a5f14e1..a6c60ac 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -109,7 +109,12 @@ 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/$app" +git clone --quiet $git_repository "$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" #================================================= # NGINX CONFIGURATION