kiss: Swap to git pulls for updates
This commit is contained in:
parent
2f918ca372
commit
dcb5cd4d4f
6
kiss
6
kiss
|
@ -1194,8 +1194,7 @@ pkg_updates() {
|
||||||
esac
|
esac
|
||||||
|
|
||||||
if [ -w "$PWD" ] && [ "$uid" != 0 ]; then
|
if [ -w "$PWD" ] && [ "$uid" != 0 ]; then
|
||||||
git fetch
|
git pull
|
||||||
git merge
|
|
||||||
git submodule update --remote --init -f
|
git submodule update --remote --init -f
|
||||||
|
|
||||||
else
|
else
|
||||||
|
@ -1219,8 +1218,7 @@ pkg_updates() {
|
||||||
# on the other hand requires that each argument be
|
# on the other hand requires that each argument be
|
||||||
# properly quoted as the command passed to it must
|
# properly quoted as the command passed to it must
|
||||||
# be a string... This sets quotes where needed.
|
# be a string... This sets quotes where needed.
|
||||||
git_cmd="git fetch && git merge"
|
git_cmd="git pull && git submodule update --remote --init -f"
|
||||||
git_cmd="$git_cmd && git submodule update --remote --init -f"
|
|
||||||
case $su in *su) git_cmd="'$git_cmd'"; esac
|
case $su in *su) git_cmd="'$git_cmd'"; esac
|
||||||
|
|
||||||
# Spawn a subshell to run multiple commands as
|
# Spawn a subshell to run multiple commands as
|
||||||
|
|
Loading…
Reference in New Issue