From 353ee6ffbbfbaf0b1d8d3a7aec1a73a0207407d9 Mon Sep 17 00:00:00 2001 From: oufmilo <44617467+oufmilo@users.noreply.github.com> Date: Mon, 30 Jan 2023 20:06:12 +0100 Subject: [PATCH] Fix install + upgrade + _common.sh --- scripts/_common.sh | 2 +- scripts/install | 2 +- scripts/upgrade | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 61b4322..8414a44 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -6,7 +6,7 @@ NODEJS_VERSION="18.13.0" -COMMIT="663999556f8dd416f242d65fc7d714d92dbfb987" +COMMIT="44b953981826e89fb637a5c49e028152d6389b9a" # dependencies used by the app pkg_dependencies="ffmpeg postgresql build-essential" diff --git a/scripts/install b/scripts/install index 55a6096..b4d36dd 100755 --- a/scripts/install +++ b/scripts/install @@ -102,7 +102,7 @@ ynh_app_setting_set --app=$app --key=final_path --value=$final_path git clone https://github.com/misskey-dev/misskey.git "$final_path" --quiet pushd "$final_path" - git checkout $COMMIT + git checkout $COMMIT --quiet git submodule update --init popd diff --git a/scripts/upgrade b/scripts/upgrade index a099856..1d93d33 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -108,8 +108,9 @@ then # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$final_path" --keep=".config/default.yml" pushd "$final_path" - git checkout $COMMIT + git checkout master git pull --quiet + git checkout $COMMIT --quiet git submodule update --init --quiet popd fi