improve sudo experience

tuxecure · Apr 15, 2024 · 701c33f · 701c33f
1 parent 3e7a42e
commit 701c33f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/crackle b/crackle
@@ -194,7 +194,8 @@ APT_CACHE="apt-cache -o Dir::Cache=$APTCACHE -o Dir::State=$APTSTATE -o Dir::Etc
     }
     [[ -z "$rootprofile" ]] && {
         say "Amending /root/.profile...";
-        _crackleconf -v start="#rootprofile" "$SCRP_DIR"/crackle.conf | sudo -k tee --append /root/.profile > /dev/null;
+        _crackleconf -v start="#rootprofile" "$SCRP_DIR"/crackle.conf | sudo_run "tee --append /root/.profile > /dev/null";
+	sudo -K;
     }
 
     [[ -d "$PKG_PREFIX/lib/crackle" ]] || mkdir -p "$PKG_PREFIX/lib/crackle";
@@ -276,6 +277,7 @@ APT_CACHE="apt-cache -o Dir::Cache=$APTCACHE -o Dir::State=$APTSTATE -o Dir::Etc
     sudo_run "find $SUDO_BIN -xtype l -exec rm {} +";
     sudo_run "find $SUDO_CONFIG -xtype l -exec rm {} +";
     find "$CRACKLECMP" -xtype l -exec rm {} +;
+    sudo -K;
     say "Done";
     exit 0;
 }
@@ -297,11 +299,12 @@ APT_CACHE="apt-cache -o Dir::Cache=$APTCACHE -o Dir::State=$APTSTATE -o Dir::Etc
     [[ -f "$CRACKLECMP/crackle" ]] && rm $CRACKLECMP/crackle;
     [[ -d "$PKG_PREFIX/lib/crackle" ]] && rm -r $PKG_PREFIX/lib/crackle;
     find "$PKG_PREFIX/bin" -xtype l -exec rm {} +;
-    find "$SUDO_BIN" -xtype l -exec rm {} +;
-    find "$SUDO_CONFIG" -xtype l -exec rm {} +;
+    sudo_run "find $SUDO_BIN -xtype l -exec rm {} +";
+    sudo_run "find $SUDO_CONFIG -xtype l -exec rm {} +";
     find "${XDG_DATA_HOME:-$HOME/.local/share}" -xtype l -exec rm {} + 2> /dev/null;
     sed -i '/cracklerc/d' $HOME/.bashrc
     sed -i '/cracklerc/d' $HOME/.profile
     find "$CRACKLECMP" -xtype l -exec rm {} +;
+    sudo -K
     exit 0;
 }
diff --git a/lib/linkfunc b/lib/linkfunc
@@ -20,6 +20,7 @@ function link_bin(){
 	[ -d "$PKGS_DIR/usr/bin" ] && ln -s $PKGS_DIR/usr/bin/* $PKG_PREFIX/bin 2> /dev/null;
 	[ -d "$PKGS_DIR/usr/sbin" ] && sudo_run "ln -s $PKGS_DIR/usr/sbin/* $SUDO_BIN 2> /dev/null";
 	[ -d "$PKGS_DIR/usr/games" ] && ln -s $PKGS_DIR/usr/games/* $PKG_PREFIX/bin 2> /dev/null;
+	sudo -K;
 }
 
 function link_bash-completion(){

diff --git a/lib/triplet b/lib/triplet
@@ -72,7 +72,7 @@ checkpath() {
 sudo_run() {
         say "this action requires sudo access"
 	set -x
-	sudo -k $1
+	sudo $1
 	set +x
 }
 download_crackle() {