Changeset 481 for trunk/samhain-install.sh.in

Timestamp:

Jul 18, 2015, 5:06:52 PM (6 years ago)

Author:

katerina

Message:

Enhancements and fixes for tickets #374, #375, #376, #377, #378, and #379.

File:

• trunk/samhain-install.sh.in (modified) (6 diffs)

trunk/samhain-install.sh.in

@@ -65 +65 @@
     echo 'action = install-boot|install-data|install-user'
     echo '         uninstall|purge|uninstall-boot'
-    echo '         uninstall-data|uninstall-man|uninstall-program|uninstall-lkm'
+    echo '         uninstall-data|uninstall-man|uninstall-program'
     echo 'samhain-install.sh --print-config <item>'
     echo 'item = name | basekey | prefix | exec_prefix | sbin_dir | man_dir'
@@ -514 +514 @@
             break;;
 
-        uninstall-lkm)
-            act=ulkm
-            break;;
-
         uninstall | remove | purge)
             opts=
@@ -525 +521 @@
             test x"$DESTDIR" = "x" || opts="$opts --destdir=$DESTDIR"
             test x"$1" = "xpurge" && purge=yes
-            echo "$0 $opts uninstall-lkm"
-            eval $0 $opts uninstall-lkm
             echo "$0 $opts uninstall-program"
             eval $0 $opts uninstall-program
@@ -680 +674 @@
               break
               ;;
-           Linux/* )
+           Linux/* | GNU/kFreeBSD/* | GNU/* )
                file=/etc/passwd
                entry="${user}:*:${uid}:${gid}:${realname}:${home}:${shell}"
@@ -886 +880 @@
         ;;
 
-    Linux/*)
+    Linux/* | GNU/kFreeBSD* | GNU/* )
         rlv="2 3 4 5"
         linkopt="-f -s"
@@ -1145 +1139 @@
 fi
 
-if test x"${act}" = xulkm
-then
-    RVER=`uname -r`
-    if test "x@sh_lkm@" != "x"; then
-        if test -d /lib/modules/$RVER; then 
-            MODDIR="/lib/modules/$RVER"
-        elif test -d /lib/modules/misc; then 
-            MODDIR="/lib/modules/misc"
-        elif test -d /lib/modules; then 
-            MODDIR="/lib/modules/misc"
-        fi
-        # -- NEW --
-        ALLMODS="@sh_lkm@"
-        for p in $ALLMODS; do
-            test -z "$verbose" || echo "  rm -f ${DESTDIR}${MODDIR}/`echo $p|sed '
-s%samhain%@install_name@%'`"
-            rm -f ${DESTDIR}${MODDIR}/`echo $p|sed 's%samhain%@install_name@%'`
-        done
-    fi
-fi
-
 if test x"${act}" = xuprogram
 then
-    PROGRAMS="@setpwd_prg@ @stegin_prg@ @yulectl_prg@ @sh_main_prg@"
+    PROGRAMS="@setpwd_prg@ @stegin_prg@ @yulectl_prg@ @sh_main_prg@ @samhainadmin_prg@"
     for p in $PROGRAMS; do
-        test -z "$verbose" || echo "  rm -f ${DESTDIR}${sbindir}/`echo $p|sed 's%samhain%@install_name@%'|sed 's%yule%@install_name@%'`"
-        rm -f ${DESTDIR}${sbindir}/`echo $p|sed 's%samhain%@install_name@%'|sed 's%yule%@install_name@%'`
+        test -z "$verbose" || echo "  rm -f ${DESTDIR}${sbindir}/`echo $p|sed 's%samhain%@install_name@%'|sed 's%yule%@install_name@%'|sed 's%.*/%%'`"
+        rm -f ${DESTDIR}${sbindir}/`echo $p|sed 's%samhain%@install_name@%'|sed 's%yule%@install_name@%'|sed 's%.*/%%'`
     done
     test -z "$verbose" || echo $ECHO_N "  ${SH_RMDIR} ${DESTDIR}${sbindir} ... $ECHO_C"