diff --git a/check_process b/check_process index 1a5eefe..23fedde 100644 --- a/check_process +++ b/check_process @@ -12,7 +12,8 @@ setup_private=1 setup_public=1 upgrade=1 - #upgrade=1 from_commit=CommitHash + # 0.5.3ynh1 + upgrade=1 from_commit=ac72525a476648c6ccc9d9b52d68fdbd638b1d31 backup_restore=1 multi_instance=0 change_url=0 diff --git a/scripts/_common.sh b/scripts/_common.sh index 4dcb681..2bccbe6 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,8 +4,6 @@ # COMMON VARIABLES #================================================= -COMMIT="cad83a339ea53cd50aed9aa45a85e9f5b6443b64" - # dependencies used by the app pkg_dependencies="postgresql postgresql-contrib python3-venv libpq-dev" diff --git a/scripts/install b/scripts/install index 7b3a2a2..defe995 100755 --- a/scripts/install +++ b/scripts/install @@ -98,12 +98,8 @@ ynh_psql_setup_db --db_user=$db_user --db_name=$db_name ynh_script_progression --message="Setting up source files..." --weight=1 ynh_app_setting_set --app=$app --key=final_path --value=$final_path -# Note: We use git instead of ynh_setup_source, cause this repo use submodules -git clone https://github.com/bookwyrm-social/bookwyrm.git "$final_path" --quiet -pushd "$final_path" - git checkout $COMMIT -popd +ynh_setup_source --dest_dir="$final_path" chmod 750 "$final_path" chmod -R o-rwx "$final_path" diff --git a/scripts/upgrade b/scripts/upgrade index df37377..5440159 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -77,13 +77,6 @@ then # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$final_path" --keep=".env" - pushd "$final_path" - git checkout production - git pull --quiet - git checkout $COMMIT - ./bw-dev update - popd - fi chmod 750 "$final_path"