forked from naskya/firefish
dev: minor refactor of update scripts
This commit is contained in:
parent
a2f684ce00
commit
d82cab5d4d
2 changed files with 3 additions and 4 deletions
|
@ -22,7 +22,7 @@ br() {
|
|||
}
|
||||
|
||||
version() {
|
||||
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_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)
|
||||
printf '%s.%s' "${COMMIT_DATE}" "${COMMIT_HASH_INITIAL}"
|
||||
}
|
||||
|
|
|
@ -11,12 +11,11 @@ br
|
|||
OLD_COMMIT=$(git rev-parse HEAD)
|
||||
|
||||
say 'Pulling changes from the remote repo...'
|
||||
|
||||
run 'git checkout -- package.json packages/backend/assets'
|
||||
|
||||
run 'git pull --ff --no-edit --autostash --strategy-option theirs'
|
||||
|
||||
NEW_COMMIT=$(git rev-parse HEAD)
|
||||
|
||||
say 'Pulled successfully!'
|
||||
br
|
||||
|
||||
|
|
Loading…
Reference in a new issue