[SM-Commit] GIT changes to master grimoire by Justin Boffemmyer (69f0553ded54cdc129dae7211a5f8e9c45235be9)

Justin Boffemmyer scm at sourcemage.org
Sun Oct 17 11:18:53 EDT 2010


GIT changes to master grimoire by Justin Boffemmyer <flux at sourcemage.org>:

 smgl/cauldron/CONFIGURE |   14 ++++++++++----
 smgl/cauldron/HISTORY   |    5 +++++
 smgl/cauldron/INSTALL   |    6 +++---
 3 files changed, 18 insertions(+), 7 deletions(-)

New commits:
commit 69f0553ded54cdc129dae7211a5f8e9c45235be9
Author: Justin Boffemmyer <flux at sourcemage.org>
Commit: Justin Boffemmyer <flux at sourcemage.org>

    smgl/cauldron: fix configure/install behavior
    
    Corrected the installation of manpages so that they properly install to
    subdirectories of /usr/share/man, and only if there is something to
    install. Made the query for what installer interfaces to install depend
    on whether enchantment was selected to install, since the installer
    interfaces are front-ends to enchantment and therefore depend on it.

diff --git a/smgl/cauldron/CONFIGURE b/smgl/cauldron/CONFIGURE
index 999bfaa..6c5db3f 100755
--- a/smgl/cauldron/CONFIGURE
+++ b/smgl/cauldron/CONFIGURE
@@ -5,10 +5,16 @@ config_query_multi CHOSEN_SCRIPTS\
                    "cauldron" \
                    "enchantment" &&
 
-config_query_multi INTERFACES \
-                   "Which installer interfaces would you like installed?" \
-		   "menu" \
-		   "shell" &&
+for scripts in $CHOSEN_SCRIPTS
+do
+  if [[ "$scripts" == "enchantment" ]]
+  then
+    config_query_multi INTERFACES \
+                       "Which installer interfaces would you like installed?" \
+                       "shell" \
+                       "menu"
+  fi
+done &&
 
 config_query_string SCRIPT_BASE \
                     "What should the base path for the scripts be?" \
diff --git a/smgl/cauldron/HISTORY b/smgl/cauldron/HISTORY
index 5b22985..f745002 100644
--- a/smgl/cauldron/HISTORY
+++ b/smgl/cauldron/HISTORY
@@ -1,3 +1,8 @@
+2010-10-18 Justin Boffemmyer <flux at sourcemage.org>
+	* CONFIGURE: make query for installers depend on whether enchantment
+	  was selected
+	* INSTALL: correct installment of man pages
+
 2010-06-04 Justin Boffemmyer <flux at sourcemage.org>
 	* ALL: spell created
 
diff --git a/smgl/cauldron/INSTALL b/smgl/cauldron/INSTALL
index a1f8309..57f3b7b 100755
--- a/smgl/cauldron/INSTALL
+++ b/smgl/cauldron/INSTALL
@@ -103,12 +103,12 @@ do
   # install any man pages
   if [[ "$DOCUMENTATION" = 'y' ]]
   then
-    for manpage in "$selected/doc"/*.[1-8]
+    for manpage in $(find "$selected/doc" -name '*.[1-8]')
     do
       # make sure the man dir exists for the needed category first
-      install -v -d -m 0755 "/usr/share/man${manpage##.}" &&
+      install -v -d -m 0755 "/usr/share/man/man${manpage##*.}" &&
       # install the man page
-      install -v -m 0644 "$manpage" "/usr/share/man${manpage##.}/"
+      install -v -m 0644 "$manpage" "/usr/share/man/man${manpage##*.}/"
     done
   fi &&
 



More information about the SM-Commit mailing list