Permalink
Browse files

BETTER BETTER

  • Loading branch information...
1 parent 7e72969 commit 7773572d89c7b45b4c5b5af70cab7c5f26baeed0 @thomasfrivold committed Oct 27, 2013
Showing with 33 additions and 38 deletions.
  1. +31 −36 LUKSUS
  2. +2 −2 LUKSUS.functions
View
67 LUKSUS
@@ -82,83 +82,83 @@ fi
#########################################################
#########################################################
#########################################################
-set -o noclobber
-set -o errtrace
-set -o errexit
-set -o pipefail
+# set -o noclobber
+set -o errtrace #enables error trace with trap
+set -o errexit #enables exit tasks with trap
+set -o pipefail #
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
+
-$DEBUGSTEP
# Calling functions
OSTEST
-$DEBUGSTEP
+
# MENUSYSTEM - USER INTERACTION
GRAPHICALWELCOME
-$DEBUGSTEP
+
WELCOMEINFORMATION
-$DEBUGSTEP
+
WIZARD
-$DEBUGSTEP
+
MENUSYSTEM
-$DEBUGSTEP
+
GRAPHICALVERIFYCHOICES
-$DEBUGSTEP
+
ASKUSERVERIFYCONSOLE # safety check. To be sure.
# PREPARE KEYFILE
-$DEBUGSTEP
+
CREATEKEYFILE
# LOOP DEVICE FUNCTIONS AND HOUSEKEEPING
-$DEBUGSTEP
+
LOOPBACKTEST
-$DEBUGSTEP
+
DRAGONFLYHOUSEKEEPING
-$DEBUGSTEP
+
FREEBSDHOUSEKEEPING
-$DEBUGSTEP
+
NETBSDHOUSEKEEPING
# THE STUFF BELOW REQUIRES STABLE RUNTIME VARIABLES
# NOTE TO SELF - DON'T LET USER CHANGE ANY VARIABLES BELOW HERE
# BEGIN PROGRAM
-$DEBUGSTEP
+
LOOPBACKMETHOD
-$DEBUGSTEP
+
DEVICEEXISTS
-$DEBUGSTEP
+
DONTSHREDIFLOOPBACK
### ENCRYPTION PHASE ###
# TRUECRYPT PROCESS
-$DEBUGSTEP
+
TRUECRYPT
-$DEBUGSTEP
+
TRUECRYPTKEYFILE
-$DEBUGSTEP
+
TRUECRYPTOPEN
# LUKS PROCESS
-$DEBUGSTEP
+
LUKS
-$DEBUGSTEP
+
LUKSKEYFILE
-$DEBUGSTEP
+
LUKSVERIFY
-$DEBUGSTEP
+
LUKSOPEN
# GELI PROCESS
-$DEBUGSTEP
+
GELI
-$DEBUGSTEP
+
GELIKEYFILE
-$DEBUGSTEP
+
GELIOPEN
# CGD PROCESS COMING SOON FOR NETBSD SUPPORT
@@ -177,17 +177,12 @@ GELIOPEN
# OPENPGPOPEN
# CREATING THE FILESYSTEM AND MOUNTING IT
-$DEBUGSTEP
CREATEANDMOUNTFS
# END PROGRAM
-$DEBUGSTEP
-DISPLAYLOGO
-$DEBUGSTEP
+#DISPLAYLOGO
echo The data below can also be found in /keys/$name.information
DISPLAYSUMMARY
-$DEBUGSTEP
-$DEBUGSTEP
WRITEINFORMATIONFILE
DISPLAYSUMMARYGRAPHICAL
DISPLAYSUMMARY
View
@@ -67,8 +67,8 @@ esac
TRAPERR()
{
- echo "ERROR: ${BASH_SOURCE[1]} '' \
- ''at about line ${BASH_LINENO[0]}"
+ echo "ERROR: ${BASH_SOURCE[1]} "" \
+ ""at about line ${BASH_LINENO[0]}"
}
EXITHOUSEKEEPING()

0 comments on commit 7773572

Please sign in to comment.