diff --git a/neko/update/native.sh b/neko/update/native.sh index edbb00938..80cfe4fde 100755 --- a/neko/update/native.sh +++ b/neko/update/native.sh @@ -54,7 +54,6 @@ br if [ ! -f packages/backend/native-utils/built/index.js ]; then say 'Something went wrong orz... Gonnya try fixing that.' run 'cp neko/index.js packages/backend/native-utils/built/index.js' - cp neko/index.js packages/backend/native-utils/built/index.js else say "It's going well so far!" br diff --git a/update.sh b/update.sh index 32acdcd41..1018d7208 100755 --- a/update.sh +++ b/update.sh @@ -13,10 +13,8 @@ OLD_COMMIT=$(git rev-parse HEAD) say 'Pulling changes from the remote repo...' run 'git checkout -- package.json packages/backend/assets' -git checkout -- package.json packages/backend/assets run 'git pull --ff --no-edit --autostash --strategy-option theirs' -git pull --ff --no-edit --autostash --strategy-option theirs NEW_COMMIT=$(git rev-parse HEAD) say 'Pulled successfully!'