Permalink
Browse files

Bygge en båt og bo i

  • Loading branch information...
1 parent c0d5c84 commit 5dbde5edeb28c359d003d06d653c250496068712 @thomasfrivold committed Oct 27, 2013
Showing with 26 additions and 12 deletions.
  1. +9 −7 LUKSUS.checks
  2. +11 −1 LUKSUS.testarena
  3. +2 −1 LUKSUS.variables
  4. +4 −3 README
View
16 LUKSUS.checks
@@ -1,6 +1,6 @@
# DOING CONDITIONAL CHECKING
# CHECKING IF RUNTIME ARGUMENTS ARE COOL
-## Testing if the user has any options for LUKSUS. These should
+# Testing if the user has any options for LUKSUS. These should
# probably be ported to GETOPTS code, but it has to stay like this for
# now. Will fix later, maybe, one day.
if [ -z "$1" ]
@@ -74,15 +74,17 @@ echo Using passphrase
USEKEY=false
fi
+# WHIPTAIL SUPPORT IS TEMPORARILY REMOVED. IT REALLY IS LACKING A LOT
+# OF DIALOG FEATURES.
## Dialog/Whiptail test - see which one to use
# check whether whiptail or dialog is installed
-read dialogapp <<< "$(which whiptail dialog 2> /dev/null)"
-
+#read dialogapp <<< "$(which whiptail dialog 2> /dev/null)"
+#
# exit if none found
-[[ "$dialogapp" ]] || {
- echo 'neither whiptail nor dialog found' >&2
- exit 1
-}
+#[[ "$dialogapp" ]] || {
+# echo 'neither whiptail nor dialog found' >&2
+# exit 1
+#}
# just use whichever was found
# This is only cool for the dev himself # "$dialogapp" --msgbox "Message displayed with $dialogapp" 0 0
View
12 LUKSUS.testarena
@@ -1,13 +1,22 @@
# FUNCTIONS FILE FOR WRITING NEW FUNCTIONS TO THE APPLICATION
# THIS FILE EXISTS BECAUSE WRITING NEW CODE EASILY BREAKS THE MAIN
# FUNCTIONS FILE AND THE WHOLE PROGRAM BREAKS
-
+UNAME=linux
ENCRYPTIONENGINE()
{
DIALOGAPP=${DIALOG=dialog}
tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$
trap "rm -f $tempfile" 0 1 2 5 15
+if [[ UNAME == Linux ]]
+then
+echo RUNNING LINUX, THESE ARE YOUR OPTIONS
+echo LUKS
+echo TRUECRYPT
+echo OPENPGP
+sleep 30s
+else
+
$DIALOGAPP --clear --title "Set your preferred encryption engine" \
--menu "Please choose encryption engine" 20 51 4 \
"LUKS" "LUKS (Linux and DragonFlyBSD)" \
@@ -29,6 +38,7 @@ case $retval in
255)
echo "ESC pressed.";;
esac
+fi
}
View
3 LUKSUS.variables
@@ -23,8 +23,9 @@ USEKEY=false
freebsdloopnumber=$(echo $device|{ read; echo "${REPLY#${REPLY%?}}";})
ENCRYPTION=LUKS
NEXT=false
-DIALOGAPPOPTIONS="--nocancel"
+#DIALOGAPPOPTIONS="--nocancel"
#DIALOGAPPOPTIONS="--exit-label "PROCEED" --backtitle $programname $version --title "$version""
#--exit-label "PROCEED"
# Set DEBUGSTEP=DEBUGSTEP to enable debugging
DEBUGSTEP=
+dialogapp=dialog
View
7 README
@@ -56,7 +56,8 @@ A: I wrote this script because I wanted to have a way to easily and casually cre
Q: What is the license of LUKSUS?
A: LUKSUS is free libre open source software, released under the GPLv2
license. Please let me know if the GPLv2 makes it hard for you to use it, and I
- will consider adding an extra license or changing it.
+ will consider adding an extra license or changing it. Perhaps
+ changing to MIT license.
Q: Why should I encrypt?
A: It is beyond the scope of this README to go indepth.
@@ -269,14 +270,15 @@ Consider posting elsewhere
I tell these people they can either fork my project,
submit code via github or take a hike to /dev/null.
In fact it reminds me of when I built an outdoor balcony for
-my mum. Every carpenter came by our house and chimed in on building
+my mum. Every carpenter in the neighbourhood came by our house and chimed in on building
techniques, and without exception they alled condemmed my project
saying it would fail and that with my building technique the balcony
would only last one season. Well 10 years on, the balcony is still
there, the ice and tundra hasn't twisted the wood foundation, and
it helped raise the value of the appartment by 15000EUR.
I see the same kind of sentiments from uber-coders about my project,
and really I don't care.
+
The project is thoroughly tested and since I know firsthand that
everything works, I don't care when they complain about wasting computer
cycles and doing things more efficiently. It's a bash script, not
@@ -287,7 +289,6 @@ to break randomly. I am considering eliminating whiptail support
after all the pain involved in seeing where it isn't compatible with
dialog.
-
* Some engines do not support keyfiles, and yet I let the user
specify keyfile usage with these engines. This needs to be fixed,
just so that the user experience is smoother.

0 comments on commit 5dbde5e

Please sign in to comment.