kiss: Swap to git pulls for updates

This commit is contained in:
Dylan Araps 2020-06-28 10:00:46 +03:00
parent 2f918ca372
commit dcb5cd4d4f
No known key found for this signature in database
GPG Key ID: 46D62DD9F1DE636E
1 changed files with 2 additions and 4 deletions

6
kiss
View File

@ -1194,8 +1194,7 @@ pkg_updates() {
esac
if [ -w "$PWD" ] && [ "$uid" != 0 ]; then
git fetch
git merge
git pull
git submodule update --remote --init -f
else
@ -1219,8 +1218,7 @@ pkg_updates() {
# on the other hand requires that each argument be
# properly quoted as the command passed to it must
# be a string... This sets quotes where needed.
git_cmd="git fetch && git merge"
git_cmd="$git_cmd && git submodule update --remote --init -f"
git_cmd="git pull && git submodule update --remote --init -f"
case $su in *su) git_cmd="'$git_cmd'"; esac
# Spawn a subshell to run multiple commands as