sup39/firefish
1
0
Fork 0
forked from naskya/firefish
Code Issues Pull requests Activity

dev: minor refactor of update scripts

Browse source
This commit is contained in:
naskya 2023-11-21 21:33:56 +09:00
parent a2f684ce00
commit d82cab5d4d
Signed by: naskya
GPG key ID: 164DFF24E2D40139
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
neko/update/utils
View file

@ -22,7 +22,7 @@ br() {
} }
version() { version() {
COMMIT_DATE=$(git show --no-patch --pretty="%cs" FETCH_HEAD | sed -e "s/-//g" | cut -c 3-) COMMIT_DATE=$(git show --no-patch --pretty='%cs' FETCH_HEAD | sed -e 's/-//g' | cut -c 3-)
COMMIT_HASH_INITIAL=$(printf "%s" "$(git rev-parse FETCH_HEAD)" | cut -c 1) COMMIT_HASH_INITIAL=$(printf '%s' "$(git rev-parse FETCH_HEAD)" | cut -c 1)
printf '%s.%s' "${COMMIT_DATE}" "${COMMIT_HASH_INITIAL}" printf '%s.%s' "${COMMIT_DATE}" "${COMMIT_HASH_INITIAL}"
} }

3
update.sh
View file

@ -11,12 +11,11 @@ br
OLD_COMMIT=$(git rev-parse HEAD) 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'
run 'git pull --ff --no-edit --autostash --strategy-option theirs' run '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!'
br br