Merge pull request #85 from Bandie/master

Prevent to run script which weren't "built"; symlink to pixmaps dir (Unity compatible)

configure.ac

@@ -14,6 +14,8 @@ AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
 
 AC_USE_SYSTEM_EXTENSIONS
+AC_PROG_LN_S
+AC_PROG_MKDIR_P
 
 AC_PROG_CC
 CFLAGS+=" -std=gnu11"

src/pam_panic_config/Makefile.am

@@ -2,7 +2,7 @@ SUBDIRS = applications icons/48x48 icons/64x64 icons/scalable
 bin_SCRIPTS = pam_panic_config
 
 %: %.prebuild
-	{ sldr=$$(echo "$(SECUREDIR)" | $(SED) 's/\//\\\//g');	$(SED) "s/__SECURELIBDIR__/$$sldr/" $< > $@ ; }
+	{ sldr=$$(echo "$(SECUREDIR)" | $(SED) 's/\//\\\//g'); bdr=$$(echo "$(bindir)" | $(SED) 's/\//\\\//g'); $(SED) "s/__SECURELIBDIR__/$$sldr/;s/__PAMPANICPW__/$$bdr\/pam_panic_pw/" $< > $@ ; }
 
 clean-local:
 	$(RM) *.tmp

src/pam_panic_config/icons/scalable/Makefile.am

@@ -1,2 +1,7 @@
 appicondir=$(datadir)/icons/hicolor/scalable/apps
 appicon_DATA=pampanic.svg
+pixmapsdir=$(datadir)/pixmaps
+
+install-exec-hook:
+	$(MKDIR_P) $(pixmapsdir)
+	$(LN_S) $(appicondir)/pampanic.svg $(pixmapsdir)/pampanic.svg

src/pam_panic_config/pam_panic_config.prebuild

@@ -10,6 +10,9 @@ LHBU="$HOME/LUKSHeaderBackup"
 
 # Set on build time
 SECUREDIR="__SECURELIBDIR__"
+PAMPANICPW="__PAMPANICPW__"
+
+[[ ! -d $SECUREDIR ]] || [[ ! -f $PAMPANICPW ]]  && { echo "ERROR: Bash script was not build correctly." ; exit 1 ; }
 
 if [ $EUID -ne 0 ]; then
   echo "Please run this script as root or using sudo."
@@ -174,7 +177,7 @@ while [ $auth_mode -eq 2 ]; do
       case $setpw in
           "0")
             clear
-            pam_panic_pw
+            $PAMPANICPW
             if [ $? -ne 0 ]; then
               clear
               echo "Failed to set a password. :("