commit 2489bcfa1b54399971404925ef9e3d379133e5cb parent 1c14dae88f3588d768af3fa52c35d275cc3f5e56 Author: parazyd <parazyd@dyne.org> Date: Tue, 29 Mar 2016 21:37:07 +0200 laziness Diffstat:
16 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/Makefile b/Makefile @@ -1,14 +1,14 @@ all: - make -C src/tomb/kdf-keys + make -C src/Tomb/kdf-keys @./conf/config.sh checkdep install: - make -C src/tomb install - make -C src/tomb/kdf-keys install + make -C src/Tomb install + make -C src/Tomb/kdf-keys install @./conf/config.sh snowman clean: - make -C src/tomb/kdf-keys clean + make -C src/Tomb/kdf-keys clean uninstall: @./conf/config.sh unsnowman diff --git a/conf/config.sh b/conf/config.sh @@ -106,6 +106,7 @@ edit-sudo() { print "######################################" popd + return 0 } # `make uninstall` @@ -116,8 +117,8 @@ edit-sudo() { # /etc/init.d/coffin stop # uncomment if you wish to revert apache - #revert=1 - [[ $revert = 0 ]] || { + #revert=true + [[ $revert == "true" ]] && { a2dissite coffindav.conf a2ensite 000-default.conf rm -rv /home/graveyard/DAV @@ -133,9 +134,9 @@ edit-sudo() { # rm -v /etc/init.d/coffin rm -rv /etc/ssl/coffin - rm -v ../src/tomb-kdb-hexencode - rm -v ../src/tomb-kdb-pbkdf2 - rm -v ../src/tomb-kdb-pbkdf2-gensalt - rm -v ../src/tomb-kdb-pbkdf2-getiter - rm -v ../src/tomb + rm -v src/tomb-kdb-hexencode + rm -v src/tomb-kdb-pbkdf2 + rm -v src/tomb-kdb-pbkdf2-gensalt + rm -v src/tomb-kdb-pbkdf2-getiter + rm -v src/tomb } diff --git a/src/tomb/.gitignore b/src/Tomb/.gitignore diff --git a/src/tomb/Makefile b/src/Tomb/Makefile diff --git a/src/tomb/doc/Makefile.am b/src/Tomb/doc/Makefile.am diff --git a/src/tomb/doc/tomb.1 b/src/Tomb/doc/tomb.1 diff --git a/src/tomb/kdf-keys/.gitignore b/src/Tomb/kdf-keys/.gitignore diff --git a/src/tomb/kdf-keys/Makefile b/src/Tomb/kdf-keys/Makefile diff --git a/src/tomb/kdf-keys/README b/src/Tomb/kdf-keys/README diff --git a/src/tomb/kdf-keys/benchmark.c b/src/Tomb/kdf-keys/benchmark.c diff --git a/src/tomb/kdf-keys/gen_salt.c b/src/Tomb/kdf-keys/gen_salt.c diff --git a/src/tomb/kdf-keys/hexencode.c b/src/Tomb/kdf-keys/hexencode.c diff --git a/src/tomb/kdf-keys/pbkdf2.c b/src/Tomb/kdf-keys/pbkdf2.c diff --git a/src/tomb/kdf-keys/test.sh b/src/Tomb/kdf-keys/test.sh diff --git a/src/tomb/kdf-keys/test.txt b/src/Tomb/kdf-keys/test.txt Binary files differ. diff --git a/src/tomb/tomb b/src/Tomb/tomb