[Modconf-commits] r179 - in trunk/modconf: . debian

[Frank Lichtenheld]

Author: djpig
Date: 2005-05-07 00:57:46 +0000 (Sat, 07 May 2005)
New Revision: 179

Modified:
   trunk/modconf/debian/changelog
   trunk/modconf/modconf
Log:
  * Fix the --libdir option to actually make what the man page
    says it does. Introduce a new --contentdir option which
    actually does what the "old" --libdir option would have
    been done if there weren't a typo in the var...
  * Also use the --libdir option to find the modules, not
    only the eval files


Modified: trunk/modconf/debian/changelog
===================================================================
--- trunk/modconf/debian/changelog	2005-05-07 00:47:20 UTC (rev 178)
+++ trunk/modconf/debian/changelog	2005-05-07 00:57:46 UTC (rev 179)
@@ -1,6 +1,11 @@
 modconf (0.2.49) UNRELEASED; urgency=low
 
-  * 
+  * Fix the --libdir option to actually make what the man page
+    says it does. Introduce a new --contentdir option which
+    actually does what the "old" --libdir option would have
+    been done if there weren't a typo in the var...
+  * Also use the --libdir option to find the modules, not
+    only the eval files
 
  -- Frank Lichtenheld <djpig@debian.org>  Sat,  7 May 2005 02:45:48 +0200
 

Modified: trunk/modconf/modconf
===================================================================
--- trunk/modconf/modconf	2005-05-07 00:47:20 UTC (rev 178)
+++ trunk/modconf/modconf	2005-05-07 00:57:46 UTC (rev 179)
@@ -52,11 +52,11 @@
       shift
       ;;
     --libdir)
-      ModuleContentsDir=$2
+      ModuleHelpDir=$2
       shift
       ;;
-    --helpdir)
-      ModuleHelpDir=$2
+    --contentdir)
+      ModuleContentDir=$2
       shift
       ;;
     --restrict-section)
@@ -180,21 +180,19 @@
 Source=mounted
 parse_cmdline $*
 
-if [ -d $Target/usr/share/modconf ]; then
-    libdir=$Target/usr/share/modconf
-else
-    libdir=/usr/share/modconf
+# default if not set from cmdline
+ModuleHelpDir=${ModuleHelpDir:-/usr/share/modconf}
+
+if [ -d "$Target/$ModuleHelpDir" ]; then
+    ModuleHelpDir="$Target/$ModuleHelpDir"
 fi
 
-. $libdir/params
-. $libdir/util
-. $libdir/dialog
+. "$ModuleHelpDir/params"
+. "$ModuleHelpDir/util"
+. "$ModuleHelpDir/dialog"
 
 trap "rm -f $TempFile $TempFile1 $TempFile2 $TempFile3 $TempFile4 $TempFile5" 0 9 15
 
-# default if not set from cmdline
-ModuleHelpDir=${ModuleHelpDir:-$Target/usr/share/modconf}
-
 source_eval
 
 if [ -z "$KernelVersion" ]; then