Changeset 556 for trunk

Timestamp:

Jul 14, 2020, 1:20:22 PM (4 years ago)

Author:

katerina

Message:

Fix for ticket #445 (portable binary installer)

Location:

trunk

Files:

• Makefile.in (modified) (3 diffs)
• docs/Changelog (modified) (1 diff)
• samhain-install.sh.in (modified) (1 diff)
• scripts/makeself/makeself.sh (modified) (1 diff)

trunk/Makefile.in

@@ -687 +687 @@
 run-light: all
         @echo "Building $(PACKAGE)-$(VERSION).run"; \
-        STAGE=$(PACKAGE)-$(VERSION); \
+        STAGE=$(PACKAGE)-$(VERSION)-run-installer; \
         mkdir $$STAGE; \
         if test x"$$?" != x0; then \
@@ -709 +709 @@
         echo  "cp -p $$temp/* $(sbindir) || exit 1" >> $$STAGE/setup.sh; \
         temp=`echo $(sysconfdir) | sed s,^/,,`; \
-        echo "chown root $$temp/*" >> $$STAGE/setup.sh; \
+        echo "chown -R root $$temp/*" >> $$STAGE/setup.sh; \
         configfile=`echo  @myconffile@ | sed 's%^REQ_FROM_SERVER%%'`; \
-        echo  "test -f $$configfile || cp -p $$temp/* $$configfile" >> $$STAGE/setup.sh; \
-        echo  "./samhain-install.sh --express --verbose install-boot || echo 'Cannot install init script'"    >> $$STAGE/setup.sh; \
+        echo  "cp -pr $$temp/* @sysconfdir@"                           >> $$STAGE/setup.sh; \
+        echo  "./samhain-install.sh --express --verbose install-boot"  >> $$STAGE/setup.sh; \
+        echo  "if [ \$$? -ne 0 ]"                                      >> $$STAGE/setup.sh; \
+        echo  "then"                                                   >> $$STAGE/setup.sh; \
+        echo  "  echo 'Installation finished, but could not install boot-time init scripts'"      >> $$STAGE/setup.sh; \
+        echo  "  exit 2"                                               >> $$STAGE/setup.sh; \
+        echo  "fi"                                                     >> $$STAGE/setup.sh; \
+        echo  "echo 'Installation finished'"                           >> $$STAGE/setup.sh; \
+        echo  "exit 0"                                                 >> $$STAGE/setup.sh; \
         cp $(top_srcdir)/mkinstalldirs $$STAGE/; \
         cp $(top_srcdir)/install-sh $$STAGE/; \
@@ -722 +729 @@
         chmod +x $$STAGE/install-sh; \
         $(top_srcdir)/scripts/makeself/makeself.sh --header $(top_srcdir)/scripts/makeself/makeself-header.sh --nocomp --nomd5 --notemp $$STAGE $(PACKAGE)-$(VERSION).run "$(PACKAGE)_$(VERSION)_self_extracting_installer" ./setup.sh && \
-        rm -r $(PACKAGE)-$(VERSION)
+        rm -r $$STAGE
 
 emerge-prepare: dist

trunk/docs/Changelog

@@ +1 @@
+4.4.2:
+        * re-enabled reading options from option group [samhain] in my.cnf
+        * fix server install in configure.ac: samhainadmin.pl <-> yuleadmin.pl
+        * add more verbosity to portable binary installer, fix minor issues
+
 4.4.1:
         * fix compatibility problem with older (version 2.0.x) GnuPG

trunk/samhain-install.sh.in

@@ -1137 +1137 @@
                 echo "  ${DESTDIR}/${rc_systemd}/${samhain}.service exists ... not overwritten (or use --force)"
             else
+                test -z "$verbose" || echo "  installing ${servicescript} as ${DESTDIR}/${rc_systemd}/${samhain}.service"
                 ${INSTALL_DATA} ${servicescript} "${DESTDIR}/${rc_systemd}/${samhain}.service"
             fi

trunk/scripts/makeself/makeself.sh

@@ -293 +293 @@
 echo Adding files to archive named \"$archname\"...
 (cd "$archdir"; tar $TAR_ARGS - * | eval "$GZIP_CMD" ) >> "$tmpfile" || { echo Aborting; rm -f "$tmpfile"; exit 1; }
-echo >> "$tmpfile" >&- # try to close the archive
+# The following command seems both superfluous and causing an 'I/O error' message
+# echo >> "$tmpfile" >&- # try to close the archive
 
 fsize=`cat "$tmpfile" | wc -c | tr -d " "`