From 3a94ab11a137b56e8b42e4d99caff2bccd2daad3 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Thu, 23 Jun 2016 21:15:21 +0200
Subject: makemod: fix the logic.

---
 makemod | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

(limited to 'makemod')

diff --git a/makemod b/makemod
index 27ba575..ae030c9 100755
--- a/makemod
+++ b/makemod
@@ -60,21 +60,20 @@ elif [ -f "$2" -a "$INTERACTIVE" = "YES" ]; then
   fi
 fi
 
-# .sxz extension uses xz compression:
-COMPR="xz"
+MODEXT=$(echo "$2" |rev |cut -d'.' -f1 |rev)
+case $MODEXT in
+  sxz) COMPR="xz" ;;
+  sgz) COMPR="gzip" ;;
+  xzm) COMPR="xz" ;;
+    *) echo "-- Unsupported module extension '$MODEXT'" ; exit 1 ;;
+esac 
 
 if [ -d "$1" ]; then
-  echo "Creating .sxz from directory."
+  echo "Creating .${MODEXT} module from directory using '$COMPR' compression."
+  TMPDIR=$(mktemp -t -d makesxz.XXXXXX)
   PKGDIR="$1"
 else
-  MODEXT=$(echo "$2" |rev |cut -d'.' -f1 |rev)
-  case $MODEXT in
-    sxz) COMPR="xz" ;;
-    sgz) COMPR="gzip" ;;
-    xzm) COMPR="xz" ;;
-      *) echo "-- Unsupported module extension '$MODEXT'" ; exit 1 ;;
-  esac 
-  echo "Creating .${MODEXT} from package."
+  echo "Creating .${MODEXT} module from package using '$COMPR' compression."
   TMPDIR=$(mktemp -t -d makesxz.XXXXXX)
   PKGDIR="$TMPDIR"
   if [ ! -d $PKGDIR ]; then
-- 
cgit v1.2.3