Permalink
Browse files

Better dependency checks that really works

  • Loading branch information...
1 parent eff794f commit d7a54aa46c0880fdc504212331dd592aefa47a06 @thomasfrivold committed Feb 16, 2014
Showing with 8 additions and 2 deletions.
  1. +6 −2 LUKSUS.functions
  2. +2 −0 LUKSUS.variables
View
@@ -89,7 +89,7 @@ LUKSFILESET()
{
if [[ $LOOPBACKDEVICE == false ]]
then
-echo Okay. Using a physical device.
+echo Okay. This a physical device.
else
$dialogapp $DIALOGAPPOPTIONS --title $programname --msgbox "Loopbackdevice has been detected!\nYou have specified a loopbackdevice and want to create a filecontainer." 0 0
luksfile=$($dialogapp $DIALOGAPPOPTIONS --title $programname --inputbox "LUKSUS has detected that you are creating an encrypted file container.\n\nPlease specify the full path where the encrypted volume should be created. No spaces or special characters. \n\nExample: /home/mystuff.archive" $dialogsize 3>&1 1>&2 2>&3)
@@ -376,7 +376,7 @@ DRAGONFLYHOUSEKEEPING ()
FREEBSDHOUSEKEEPING ()
{
if [ $UNAME == FreeBSD ]; then
- echo We are on FreeBSD here. Cool. Doing some housekeeping...;
+ echo Doing FreeBSD specific housekeeping...;
HEADAPP=ghead
TAILAPP=gtail
SHREDAPP=gshred
@@ -543,6 +543,7 @@ echo .
fi
if [[ $ENCRYPTION == LUKS ]] && [ -z `which cryptsetup` ] ; then
echo "Missing cryptsetup. Cannot continue using LUKS. Please install cryptsetup (cryptsetup package)";
+exit 1
fi
if [[ $ENCRYPTION == LUKS ]] && [[ $SECURITYMODE == PASSPHRASE ]]; then
echo LUKS with passphrase mode
@@ -566,6 +567,7 @@ echo .
fi
if [[ $ENCRYPTION == LUKS ]] && [ -z `which cryptsetup` ] ; then
echo "Missing cryptsetup. Cannot continue using LUKS. Please install cryptsetup (cryptsetup package)";
+exit 1
fi
if [[ $ENCRYPTION == LUKS ]] && [[ $SECURITYMODE == KEYFILE ]]; then
echo LUKS with keyfile;
@@ -656,6 +658,7 @@ echo .
fi
if [[ $ENCRYPTION == TRUECRYPT ]] && [ -z `which tcplay` ] ; then
echo "Missing tcplay. Cannot continue. Please install Truecrypt (tcplay package). Note that you need the Libre Open Source GPL tcplay Truecrypt package and not the Truecrypt package downloaded from the Truecrypt.com website" ;
+exit 1
fi
if [[ $ENCRYPTION == TRUECRYPT ]] && [[ $SECURITYMODE == PASSPHRASE ]]; then
echo TrueCrypt mode;
@@ -677,6 +680,7 @@ echo .
fi
if [[ $ENCRYPTION == TRUECRYPT ]] && [ -z `which tcplay` ] ; then
echo "Missing tcplay. Cannot continue. Please install Truecrypt (tcplay package). Note that you need the Libre Open Source GPL tcplay Truecrypt package and not the Truecrypt package downloaded from the Truecrypt.com website" ;
+exit 1
fi
if [[ $ENCRYPTION == TRUECRYPT ]] && [[ $SECURITYMODE == KEYFILE ]]; then
echo TrueCrypt mode;
View
@@ -36,3 +36,5 @@ tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$
TAILAPP=tail
HEADAPP=head
SHREDAPP=shred
+# see the LUKSUS.debugstep for more info
+# DEBUGSTEP=DEBUGSTEP

0 comments on commit d7a54aa

Please sign in to comment.