From 49d29ddf11a279c01401ed7f4575f1d5de948d8d Mon Sep 17 00:00:00 2001 From: "dylan.araps@gmail.com" Date: Sun, 9 Feb 2020 12:30:26 +0000 Subject: kiss: Split git into 3 commands if running under doas/sudo FossilOrigin-Name: 491dc7ee674ee382e141d097f0f94cc9a958ef33442548861dccb84e754d039b --- kiss | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/kiss b/kiss index 3a3539f..7c01bf4 100755 --- a/kiss +++ b/kiss @@ -1090,8 +1090,11 @@ pkg_updates() { log "Dropping permissions to $user for pull" case $su in - su) as_root "$pull" ;; - *) as_root sh -c "$pull" ;; + su) as_root "$pull" ;; + + *) as_root git fetch + as_root git diff > "$mak_dir/log" + as_root git merge esac ) fi -- cgit v1.2.3