CVS: theedge/sbin lin,1.58,1.59 lrm,1.15,1.16

[elaine at lunar-linux.org]

Update of /var/cvs/lunar/theedge/sbin
In directory dbguin.lunar-linux.org:/tmp/cvs-serv27591

Modified Files:
	lin lrm 
Log Message:
Changed DEBUG to LUNAR_DEBUG, lin still needs it's functions debug-ized


Index: lin
===================================================================
RCS file: /var/cvs/lunar/theedge/sbin/lin,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- lin	22 Jul 2003 21:01:29 -0000	1.58
+++ lin	28 Jul 2003 17:40:42 -0000	1.59
@@ -44,6 +44,7 @@
     |  --deps			Configure modules and determine dependencies, 
 				but do not lin.
 
+       --debug                  show debug output
 -p  |  --probe                  Only lin if not already installed
 
 -c  |  --compile		Ignore $INSTALL_CACHE and compiles
@@ -77,6 +78,7 @@
 	 		   export FIX="$1";            shift 1  ;;
                       -s)  export SEPARATE="$1";       shift 1  ;;
                    --url)  export BASE_URL="$2";       shift 2  ;;
+                 --debug)  export LUNAR_DEBUG=on;      shift    ;;
                    --pam)  lin -c $(find_pam_aware);   shift 1  ;;
                        *)  help                                 ;;
       esac

Index: lrm
===================================================================
RCS file: /var/cvs/lunar/theedge/sbin/lrm,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- lrm	27 Jul 2003 23:36:47 -0000	1.15
+++ lrm	28 Jul 2003 17:40:42 -0000	1.16
@@ -143,7 +143,7 @@
    export TEMP_FILE=$(temp_create "lrm")
    export TEMP2_FILE=$(temp_create "lrm")
 
-   [ "$DEBUG" == "on" ] && 
+   [ "$LUNAR_DEBUG" == "on" ] && 
    [ -s "$LRM_QUEUE" ]    && 
       echo -e "\nWill process the modules: `cat $LRM_QUEUE | xargs`"
 
@@ -264,18 +264,18 @@
    {
       verbose_msg "\"$I_VERSION\" of \"$MODULE\" is installed at the moment"
 
-      [ "$DEBUG" == "on" ] && 
+      [ "$LUNAR_DEBUG" == "on" ] && 
          echo -n "  Checking if desired version is the installed version..."
 
       [ "$1" == "$I_VERSION" ] && 
       {
-         [ "$DEBUG" == "on" ] && echo "YES!!"
+         [ "$LUNAR_DEBUG" == "on" ] && echo "YES!!"
          echo "The downgrade version is the same as the installed version"
          echo "Here is the available files." 
          list_available_cache
       } || 
       {
-         [ "$DEBUG" == "on" ] && echo "NO"
+         [ "$LUNAR_DEBUG" == "on" ] && echo "NO"
       }
 
       verbose_msg "removing \"$MODULE-$I_VERSION\""
@@ -289,7 +289,7 @@
    verbose_msg "extracting cached install file..."
    [ "$TEST" == "on" ] && 
    {
-      [ "$DEBUG" == "on" ] &&
+      [ "$LUNAR_DEBUG" == "on" ] &&
       bzcat $INSTALL_CACHE/$FILENAME | tar -kt $TAR_P -C /  ||
       bzcat $INSTALL_CACHE/$FILENAME | tar -kt $TAR_P -C / >/dev/null
       verbose_msg "adding module to installed list"
@@ -297,7 +297,7 @@
 
    [ "$TEST" != "on" ] && 
    {
-      [ "$DEBUG" == "on" ] &&
+      [ "$LUNAR_DEBUG" == "on" ] &&
       bzcat $INSTALL_CACHE/$FILENAME | tar -kx $TAR_P -C / ||
       bzcat $INSTALL_CACHE/$FILENAME | 
       tar -kx $TAR_P -C / 2>/dev/null >/dev/null
@@ -378,7 +378,7 @@
       -s|--nosustain  ) export NOSUSTAIN=on;   shift ;;
       -k|--keepconfig ) export KEEPCONFIG=on;  shift ;;
       -t|--test       ) export TEST=on;        shift ;;
-      --debug         ) export DEBUG=on; shift;;
+      --debug         ) export LUNAR_DEBUG=on; shift;;
       --) shift; break ;;
        *) help;  break ;;
    esac