Permalink
Browse files

More code

  • Loading branch information...
1 parent 7773572 commit 337bb7483dbb0d785e5b20edc7bc77c11b4e1cfc @thomasfrivold committed Oct 28, 2013
Showing with 7 additions and 7 deletions.
  1. +4 −3 LUKSUS
  2. +0 −2 LUKSUS.functions
  3. +3 −2 LUKSUS.variables
View
@@ -82,12 +82,12 @@ fi
#########################################################
#########################################################
#########################################################
-# set -o noclobber
set -o errtrace #enables error trace with trap
set -o errexit #enables exit tasks with trap
-set -o pipefail #
+set -o pipefail # quit on errorlevel 1
trap EXITHOUSEKEEPING EXIT # calls housekeeping function on exit. Will be run once for errorlevel 0 and once for every errorlevel 1. awesome.
-trap TRAPERR ERR
+trap TRAPERR ERR # displays where an error occurred
+trap "rm -f $tempfile" 0 1 2 5 15
@@ -186,4 +186,5 @@ DISPLAYSUMMARY
WRITEINFORMATIONFILE
DISPLAYSUMMARYGRAPHICAL
DISPLAYSUMMARY
+EXITHOUSEKEEPING
exit 0
View
@@ -14,8 +14,6 @@ use a LOOPBACKDEVICE.\nExample:\n/dev/loop0 (Linux)\n/dev/vn0
ENCRYPTIONENGINE()
{
DIALOGAPP=${DIALOG=dialog}
-tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$
-trap "rm -f $tempfile" 0 1 2 5 15
$DIALOGAPP --clear --title "Set your preferred encryption engine" \
--menu "Please choose encryption engine" 20 51 4 \
View
@@ -24,8 +24,9 @@ freebsdloopnumber=$(echo $device|{ read; echo "${REPLY#${REPLY%?}}";})
ENCRYPTION=LUKS
NEXT=false
#DIALOGAPPOPTIONS="--nocancel"
-#DIALOGAPPOPTIONS="--exit-label "PROCEED" --backtitle $programname $version --title "$version""
+DIALOGAPPOPTIONS="--exit-label "PROCEED" --backtitle "$programname $version" --title "$version""
#--exit-label "PROCEED"
# Set DEBUGSTEP=DEBUGSTEP to enable debugging
DEBUGSTEP=
-dialogapp=dialog
+dialogapp=dialog
+tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$

0 comments on commit 337bb74

Please sign in to comment.