coffin

commit 4b3710fe9b521a3d1500d19571ce914ef8c26123
parent 77ea8408d3f2284a800e60dd36bfa337a67df6df
Author: parazyd <parazyd@dyne.org>
Date:   Wed, 30 Mar 2016 04:13:17 +0200

demo release

Diffstat:
R
conf/coffindav.conf -> conf/apachedav
 | 
0

M
conf/config.sh
 | 
5
+++--
M
conf/init.skel
 | 
4
++--
M
src/Makefile
 | 
7
+++++++
M
src/coffin
 | 
4
++--
M
src/sacrist
 | 
10
+++++-----

6 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/conf/coffindav.conf b/conf/apachedav
diff --git a/conf/config.sh b/conf/config.sh
@@ -7,7 +7,7 @@
 # `make`
 [[ $1 == "checkdep" ]] && {
 	missing=()
-	#which apache2 >/dev/null || missing+=(apache)
+	which apache2 >/dev/null || missing+=(apache)
 	which cryptsetup >/dev/null || missing+=(cryptsetup)
 	which inotifywatch >/dev/null || missing+=(inotify-tools)
 	which wipe >/dev/null || missing+=(wipe)
@@ -18,6 +18,7 @@
 #	Optional:
 #	which haveged || missing+=(haveged)
 #	which sshfs || missing+=(sshfs)
+#	which dcfldd || missing+=(dcfldd)
 	(( $#missing == 0 )) || {
 		for i in $missing; do
 			print "$i is missing."
@@ -51,7 +52,7 @@ edit-sudo() {
 
 [[ $1 == "gen-init" ]] && {
 	# TODO: ckdistro; different ones
-	print whereami
+	distro=deb
 	pushd `pwd`/conf
 	cat <<EOF | tee tempinit
 #!/bin/bash
diff --git a/conf/init.skel b/conf/init.skel
@@ -1,4 +1,4 @@
-text -x $DAEMON || exit 0
+test -x $DAEMON || exit 0
 
 case "$1" in
 	start)
@@ -7,7 +7,7 @@ case "$1" in
 		;;
 	stop)
 		echo "Stopping $DESC..."
-		pid=`cat $COFFINPID 2>/dev/null`
+		pid=`cat /var/run/coffin.pid 2>/dev/null`
 		kill $pid && rm /var/run/coffin.pid && rm /var/run/coffin.out
 		;;
 	restart)
diff --git a/src/Makefile b/src/Makefile
@@ -12,6 +12,13 @@ clean:
 install:
 	install -Dm755 coffin ${PREFIX}/coffin
 	install -Dm755 sacrist ${PREFIX}/sacrist
+	install -Dm755 zlibs/features ${PREFIX}/zlibs/features
+	install -Dm755 zlibs/hooks ${PREFIX}/zlibs/hooks
+	install -Dm755 zlibs/keyfiles ${PREFIX}/zlibs/keyfiles
+	install -Dm755 zlibs/mounts ${PREFIX}/zlibs/mounts
+	install -Dm755 zlibs/ttab ${PREFIX}/zlibs/ttab
+	install -Dm755 zlibs/zuper ${PREFIX}/zlibs/zuper
+	install -Dm644 zlibs/zuper.init ${PREFIX}/zlibs/zuper.init
 	install -Dm755 tomb ${PREFIX}/tomb
 	install -Dm755 tomb-kdb-pbkdf2 ${PREFIX}/tomb-kdb-pbkdf2
 	install -Dm755 tomb-kdb-pbkdf2-getiter ${PREFIX}/tomb-kdb-pbkdf2-getiter
diff --git a/src/coffin b/src/coffin
@@ -14,11 +14,11 @@ while read -r -u "${COPROC[0]}" event file; do
         case $event in
             CREATE)
                 echo "Created $file..." #; sleep 1
-                `pwd`/coffin $file $event
+                /usr/local/share/coffin/bin/sacrist $file $event
                 ;;
             DELETE)
                 echo "Removed $file..." #; sleep 1
-                `pwd`/coffin $file $event
+                /usr/local/share/coffin/bin/sacrist $file $event
                 ;;
         esac
     fi
diff --git a/src/sacrist b/src/sacrist
@@ -4,19 +4,19 @@
 #
 # ~ parazyd
 
-coffin_version=0.2
-coffin_release_date="Mar/2016"
+coffin_version=0.3
+coffin_release_date="Apr/2016"
 
 DEBUG=${DEBUG:-1} # NOTE: Change default value to 0 later
 QUIET=${QUIET:-0}
 LOG=${LOG:-""}
 
-swapoff -a # Security
+swapoff -a # I feel so safe
 
 zkv=1
 helpers=1
 
-R=`pwd`
+R=/usr/local/share/coffin/bin
 source $R/zlibs/zuper
 
 # USB key
@@ -54,7 +54,7 @@ KEYMOUNT="/media/tombkey" # Directory where keys get mounted
 COFFINDOT="$KEYMOUNT/.coffin" # .coffin directory on the usb key
 TTAB="$COFFINDOT/ttab" # Our ttab
 HOOKS="$COFFINDOT/hook"
-TOMB="/usr/local/share/coffin/bin/tomb"
+TOMB="$R/tomb"
 
 # Main
 req=(happenz device)