tless nesting - gtomb - tomb gtk frontend in zenity (HTM) git clone git://parazyd.org/gtomb.git (DIR) Log (DIR) Files (DIR) Refs (DIR) README (DIR) LICENSE --- (DIR) commit 61a55dc45bd6272302b90d3c133d0735d986fe00 (DIR) parent f8b4b7e2df96ca9df0235ca87a93804c58f5b59e (HTM) Author: parazyd <parazyd@dyne.org> Date: Mon, 14 Dec 2015 03:09:47 +0100 less nesting Diffstat: M gtomb | 104 ++++++++++--------------------- 1 file changed, 33 insertions(+), 71 deletions(-) --- (DIR) diff --git a/gtomb b/gtomb t@@ -18,16 +18,6 @@ function _ { _clean } - -function _sudo { - sudoassword=$(ask_password "Insert sudo password for user $USER") - echo -e "$sudoassword\n" | sudo -S touch /tmp/sudochk - if ![ -f /tmp/sudochk ]; then - _sudo - else - sudo -v - fi -} # {{{ Some pinentry code shamelessly stolen from tomb # Ask user for a password # Wraps around the pinentry command, from the GnuPG project, as it t@@ -250,8 +240,6 @@ function _main { # {{{ dig - Dig a new tomb function _dig { -# Choose a tomb name, then type in the tomb's size in MiB and finally, dig the tomb. - tombname=`zenity \ --title="Choose where to dig your tomb" \ --window-icon="monmort.png" \ t@@ -268,7 +256,6 @@ function _dig { --error \ --text="This tomb already exists. I'm not digging here." exec _main - d elif [[ $tombname == "" ]]; then zenity \ --title="Warning" \ t@@ -317,9 +304,12 @@ function _dig { --pulsate & PID_ZEN=$(ps -C zenity h -o pid,command | grep "Digging new tomb" | awk '{print $1}') + while [ "$PID_ZEN" != "" ]; do PID_ZEN=$(ps h -o pid -p ${PID_ZEN}) + PID_DD=$(ps -C dd h -o pid,command | grep "$tombname" | awk '{print $1}') + sleep 1 done t@@ -543,16 +533,15 @@ function _open { --info \ --text="Your tomb is now open." - _main - eval "_$command";; + exec _main + ;; 1) - _main - eval "_$command";; + exec _main + ;; esac ;; 1) - _main - eval "_$command" + exec _main ;; esac } t@@ -575,14 +564,10 @@ function _list { case $? in 0) - _clean - _main - eval "_$command" + exec _main ;; 1) - _clean - _main - eval "_$command" + exec _main ;; esac } t@@ -617,12 +602,10 @@ function _close { --info \ --text="Closed successfully!" - _main - eval "_$command" + exec _main ;; 1) - _main - eval "_$command" + exec _main ;; esac } t@@ -657,12 +640,10 @@ function _slam { --info \ --text="Tomb slammed successfully!" - _main - eval "_$command" + exec _main ;; 1) - _main - eval "_$command" + exec _main ;; esac } t@@ -703,24 +684,20 @@ function _resize { --info \ --text="Tomb resized successfully" - _main - eval "_$command" + exec _main ;; 1) - _main - eval "_$command" + exec _main ;; esac ;; 1) - _main - eval "_$command" + exec _main ;; esac ;; 1) - _main - eval "_$command" + exec _main ;; esac } t@@ -745,12 +722,10 @@ function _passwd { --info \ --text="Password successfully changed!" - _main - eval "_$command" + exec _main ;; 1) - _main - eval "_$command" + exec _main ;; esac } t@@ -798,24 +773,20 @@ function setkey { --info \ --text="Tomb's keyfile successfully changed!" - _main - eval "_$command" + exec _main ;; 1) - _main - eval "_$command" + exec _main ;; esac ;; 1) - _main - eval "_$command" + exec _main ;; esac ;; 1) - _main - eval "_$command" + exec _main ;; esac } t@@ -847,18 +818,15 @@ function _engrave { --info \ --text="QR code generated in $jpegfile" - _main - eval "_$command" + exec _main ;; 1) - _main - eval "_$command" + exec _main ;; esac ;; 1) - _main - eval "_$command" + exec _main ;; esac } t@@ -889,18 +857,15 @@ function bury { _clean # Clean sensitive stuff from memory - _main - eval "_$command" + exec _main ;; 1) - _main - eval "_$command" + exec _main ;; esac ;; 1) - _main - "_$command" + exec _main ;; esac } t@@ -933,18 +898,15 @@ function exhume { _clean # Clean sensitive stuff from memory - _main - eval "_$command" + exec _main ;; 1) - _main - eval "_$command" + exec _main ;; esac ;; 1) - _main - "_$command" + exec _main ;; esac }