renamed qmauth to extract

7 files changed, 7 insertions, 11 deletions

diff --git a/.gitignore b/.gitignore
index ca66862..0f667ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,10 +17,5 @@ buildmachine/
 build.ninja
 .ninja_deps
 .ninja_log
-pm_to_blib
-.configured
-JWebmail-srcdist/
-JWebmail-bindist/
 lib/JWebmail/Config.pm
 .perlcriticrc
-MANIFEST.BIN
diff --git a/MANIFEST b/MANIFEST
index f557864..646796d 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,9 +1,9 @@
 b/extract.pl
 
 script/jwebmail
-script/mojocookiecheck.pl
-script/qmauth.pl
-script/qmauth.py
+script/cookiecheck.pl
+script/extract.pl
+script/extract.py
 script/testauthenticator.pl
 
 lib/JWebmail/Controller/Webmail.pm
diff --git a/configure b/configure
index 51f911f..b17c920 100755
--- a/configure
+++ b/configure
@@ -40,7 +40,8 @@ check_ninja_version () {
     rm "$ninja_file"
 }
 
-if readlink /bin/init | grep -q systemd
+JWM_INIT=
+if readlink /sbin/init | grep -q systemd
 then JWM_INIT=systemd
 fi
 
diff --git a/confninja.sh b/confninja.sh
index 3c73e36..2da51ab 100644
--- a/confninja.sh
+++ b/confninja.sh
@@ -130,8 +130,8 @@ ALL_INST=
 
 case "$MAILDIR_EXTRACTOR_NAME" in
     (extractrs) install_file instexec bindir bin jwebmail-extract;;
-    (extractpy) install_file instexec scriptdir script qmauth.py;;
-    (extractpl) install_file instexec scriptdir script qmauth.pl;;
+    (extractpy) install_file instexec scriptdir script extract.py;;
+    (extractpl) install_file instexec scriptdir script extract.pl;;
 esac
 
 install_file instexec scriptdir script jwebmail
diff --git a/script/mojocookiecheck.pl b/script/cookiecheck.pl
index a078b8c..a078b8c 100755
--- a/script/mojocookiecheck.pl
+++ b/script/cookiecheck.pl
diff --git a/script/qmauth.pl b/script/extract.pl
index 000eaa0..000eaa0 100755
--- a/script/qmauth.pl
+++ b/script/extract.pl
diff --git a/script/qmauth.py b/script/extract.py
index 2d78f81..2d78f81 100755
--- a/script/qmauth.py
+++ b/script/extract.py