dev: remove redundant operations from upgrading scripts
This commit is contained in:
parent
7e23a6d32d
commit
21a07539a3
2 changed files with 0 additions and 3 deletions
|
@ -54,7 +54,6 @@ br
|
||||||
if [ ! -f packages/backend/native-utils/built/index.js ]; then
|
if [ ! -f packages/backend/native-utils/built/index.js ]; then
|
||||||
say 'Something went wrong orz... Gonnya try fixing that.'
|
say 'Something went wrong orz... Gonnya try fixing that.'
|
||||||
run 'cp neko/index.js packages/backend/native-utils/built/index.js'
|
run 'cp neko/index.js packages/backend/native-utils/built/index.js'
|
||||||
cp neko/index.js packages/backend/native-utils/built/index.js
|
|
||||||
else
|
else
|
||||||
say "It's going well so far!"
|
say "It's going well so far!"
|
||||||
br
|
br
|
||||||
|
|
|
@ -13,10 +13,8 @@ OLD_COMMIT=$(git rev-parse HEAD)
|
||||||
say 'Pulling changes from the remote repo...'
|
say 'Pulling changes from the remote repo...'
|
||||||
|
|
||||||
run 'git checkout -- package.json packages/backend/assets'
|
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'
|
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)
|
NEW_COMMIT=$(git rev-parse HEAD)
|
||||||
say 'Pulled successfully!'
|
say 'Pulled successfully!'
|
||||||
|
|
Loading…
Reference in a new issue