bonsai/kiss
3
0
Fork 0
forked from kiss-community/kiss
Code Issues 2 Pull Requests Projects Releases Activity

kiss: Don't git pull. Closes #141

Browse Source
This commit is contained in:
Dylan Araps 2020-02-08 10:50:31 +02:00
parent 36c27a958e
commit 4882084585
No known key found for this signature in database
GPG Key ID: 46D62DD9F1DE636E
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kiss
View File

@ -1075,7 +1075,8 @@ pkg_updates() {
esac esac
if [ -w "$PWD" ] && [ "$(id -u)" != 0 ]; then if [ -w "$PWD" ] && [ "$(id -u)" != 0 ]; then
git pull git fetch
git merge
else else
log "$PWD" "Need root to update" log "$PWD" "Need root to update"
@ -1092,7 +1093,8 @@ pkg_updates() {
[ "$user" = root ] || [ "$user" = root ] ||
log "Dropping permissions to $user for pull" log "Dropping permissions to $user for pull"
as_root git pull as_root git fetch
as_root git merge
) )
fi fi
} }
@ -1278,7 +1280,7 @@ args() {
l|list) pkg_list "$@" ;; l|list) pkg_list "$@" ;;
u|update) pkg_updates ;; u|update) pkg_updates ;;
s|search) for pkg; do pkg_find "$pkg" all; done ;; s|search) for pkg; do pkg_find "$pkg" all; done ;;
v|version) log kiss 1.3.0 ;; v|version) log kiss 1.3.1 ;;
h|help|-h|--help|'') h|help|-h|--help|'')
log 'kiss [a|b|c|i|l|r|s|u|v] [pkg] [pkg] [pkg]' log 'kiss [a|b|c|i|l|r|s|u|v] [pkg] [pkg] [pkg]'