From 1b3b90e667410292e711ea9dededbbefd9686adb Mon Sep 17 00:00:00 2001 From: Carlos A Date: Tue, 10 Sep 2019 11:45:33 +0200 Subject: [PATCH] correct errors in packaging --- minicon.bashcbuild | 10 ++++------ src/minicon.bashc | 2 +- src/version | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/minicon.bashcbuild b/minicon.bashcbuild index 861a508..a37620c 100644 --- a/minicon.bashcbuild +++ b/minicon.bashcbuild @@ -1,5 +1,5 @@ PACKAGE=minicon -VERSION=1.4 +VERSION=1.4-2 SUMMARY="MiniCon - Minimization of Container Filesystems" LICENSE="Apache 2.0" URL="https://github.com/grycap/minicon" @@ -16,8 +16,6 @@ REQUIRES="bash, jq, tar, coreutils, tar, rsync, file, strace, glibc-common, whic /usr/share/$PACKAGE/;src/version:LICENSE /usr/share/$PACKAGE/doc;doc/*.md -/usr/share/man/man1;$TMPDIR/importcon.1.gz;cp doc/man/importcon.1 $TMPDIR;gzip $TMPDIR/importcon.1 -/usr/share/man/man1;$TMPDIR/minicon.1.gz;cp doc/man/minicon.1 $TMPDIR;gzip $TMPDIR/minicon.1 -/usr/share/man/man1;$TMPDIR/mergecon.1.gz;cp doc/man/mergecon.1 $TMPDIR;gzip $TMPDIR/mergecon.1 -/usr/share/man/man1;$TMPDIR/minidock.1.gz;cp doc/man/minidock.1 $TMPDIR;gzip $TMPDIR/minidock.1 -/usr/bin/;src/minicon:src/minidock:src/importcon:src/mergecon;bashc -o $SOURCEFOLDER/$FILEPATH -cCSR $SOURCEFOLDER/${FILEPATH}.bashc;chmod +x $SOURCEFOLDER/$FILEPATH +;doc/man/*.1;gzip -fk ${FILEPATH} +/usr/share/man/man1;doc/man/*.gz +/usr/bin/;src/minicon:src/minidock:src/importcon:src/mergecon;bashc -o $SOURCEFOLDER/$FILEPATH -cCR $SOURCEFOLDER/${FILEPATH}.bashc;chmod +x $SOURCEFOLDER/$FILEPATH diff --git a/src/minicon.bashc b/src/minicon.bashc index fdaa758..7820954 100755 --- a/src/minicon.bashc +++ b/src/minicon.bashc @@ -451,7 +451,7 @@ done if [ "$LDCONFIGFILE" != "" -a -e "$ROOTFS/$LDCONFIGFILE" ]; then p_debug "creating ldconfig" - TMPFILE=$(tempfile) + TMPFILE=$(bashc.tempfile) awk '!a[$0]++' "$ROOTFS/$LDCONFIGFILE" > "$TMPFILE" mv "$TMPFILE" "$ROOTFS/$LDCONFIGFILE" ldconfig -r "$ROOTFS" diff --git a/src/version b/src/version index 21fb4db..39021e6 100644 --- a/src/version +++ b/src/version @@ -1 +1 @@ -VERSION=1.4 \ No newline at end of file +VERSION=1.4-2 \ No newline at end of file