Changeset 47fddc8 for common/common-functions

Timestamp:

08/12/2006 07:59:11 PM (18 years ago)

Author:

George Boudreau <georgeb@…>

Branches:

experimental

Children:

3fa20d4

Parents:

54f4782

Message:

Change bool parameter definitions from 0/1 to y/n to match the new menu app

File:

• common/common-functions (modified) (8 diffs)

common/common-functions

@@ -573 +573 @@
 #----------------------------#
   # Test if make must be run.
-  if [ "$RUNMAKE" = "1" ] ; then
+  if [ "$RUNMAKE" = "y" ] ; then
     # Test to make sure we're running the build as root
     if [ "$UID" != "0" ] ; then
@@ -593 +593 @@
 #----------------------------#
   # Test if the clean must be done.
-  if [ "$CLEAN" = "1" ] ; then
+  if [ "${CLEAN}" = "y" ]; then
     # Test to make sure we're running the clean as root
     if [ "$UID" != "0" ] ; then
@@ -706 +706 @@
                  --stringparam page $PAGE \
                  --stringparam lang $LANG \
-                 --stringparam keymap ${KEYMAP:-"none"} \
+                 --stringparam keymap $KEYMAP \
                  -o ./${PROGNAME}-commands/ $XSL $BOOK/$ARCH-index.xml >>$LOGDIR/$LOG 2>&1
       ;;
@@ -718 +718 @@
                  --stringparam page $PAGE \
                  --stringparam lang $LANG \
-                 --stringparam keymap ${KEYMAP:-"none"} \
+                 --stringparam keymap $KEYMAP \
                  -o ./${PROGNAME}-commands/ $XSL $BOOK/$ARCH-index.xml >>$LOGDIR/$LOG 2>&1
       ;;
@@ -732 +732 @@
                  --stringparam lang $LANG \
                  --stringparam lc_all $LC_ALL \
-                 --stringparam keymap ${KEYMAP:-"none"} \
+                 --stringparam keymap $KEYMAP \
                  --stringparam grsecurity_host $GRSECURITY_HOST \
                  -o ./${PROGNAME}-commands/ $XSL $BOOK/index.xml >>$LOGDIR/$LOG 2>&1
@@ -796 +796 @@
 
     # Test if the packages must be downloaded
-  [ ! "$GETPKG" = "1" ] && return
+  [ ! "$GETPKG" = "y" ] && return
 
   gs_wrt_message(){
@@ -826 +826 @@
         *linux/linux-* )
             [[ -z "$CONFIG" ]] && [[ -z "$BOOT_CONFIG" ]] && \
-            [[ "$GETKERNEL" = "0" ]] && continue
+            [[ "$GETKERNEL" = "n" ]] && continue
           ;;
     esac
@@ -908 +908 @@
       # Do not allow the automatic execution of the Makefile.
     echo "${tab_}${BOLD}${RED}*** ${YELLOW}Automatic execution of the generated makefile has been inhibited. ${RED}***${OFF}${nl_}"
-    RUNMAKE=0
+    RUNMAKE="n"
   fi
 }