CVS: theedge/var/lib/lunar/functions build.lunar, 1.2, 1.3 depends.lunar, 1.9, 1.10 install.lunar, 1.2, 1.3 messages.lunar, 1.5, 1.6 modules.lunar, 1.20, 1.21 moonbase.lunar, 1.8, 1.9 updatelog.lunar, 1.9, 1.10

sofar at lunar-linux.org sofar at lunar-linux.org
Mon Jul 14 22:38:22 GMT 2003


Update of /var/cvs/lunar/theedge/var/lib/lunar/functions
In directory dbguin.lunar-linux.org:/tmp/cvs-serv23434/var/lib/lunar/functions

Modified Files:
	build.lunar depends.lunar install.lunar messages.lunar 
	modules.lunar moonbase.lunar updatelog.lunar 
Log Message:
Preliminary bugrelease, fixing hopefully the wrong strings in the updatelog, fixing the failed reports bug, and several other improvments that were quite needed.


Index: build.lunar
===================================================================
RCS file: /var/cvs/lunar/theedge/var/lib/lunar/functions/build.lunar,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- build.lunar	13 Jul 2003 20:49:54 -0000	1.2
+++ build.lunar	14 Jul 2003 22:38:20 -0000	1.3
@@ -345,8 +345,6 @@
 # usage    : sort_install_queue
 # purpose  : sorts the install queue according to the dependencies
 sort_install_queue() {
-
-
    for MODULE in $@; do
      QUEUE="$QUEUE $MODULE"
      show_fancy_progress "Processing: $MODULE"
@@ -389,7 +387,7 @@
     IDATE=$(echo "$LINE" | cut -d: -f2)
     STATUS=$(echo "$LINE" | cut -d: -f3)
     IVERSION=$(echo "$LINE" | cut -d: -f4)
-    if run_details $MODULE ; then
+    if run_details $MODULE &> /dev/null ; then
       if [ "$STATUS" == "installed" ] ; then
         if [ "$VERSION" != "$IVERSION" ] || [ -z "$IDATE" ] || 
           (( "$UPDATED" > "$IDATE" )) ; then

Index: depends.lunar
===================================================================
RCS file: /var/cvs/lunar/theedge/var/lib/lunar/functions/depends.lunar,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- depends.lunar	13 Jul 2003 20:49:54 -0000	1.9
+++ depends.lunar	14 Jul 2003 22:38:20 -0000	1.10
@@ -49,7 +49,7 @@
   }
   
   export FOUND_DEPENDS="$FOUND_DEPENDS $1"
-  if ! run_details $1 ; then
+  if ! run_details $1 &> /dev/null ; then
     exit 1
   fi
 
@@ -57,9 +57,7 @@
     . "$MODULE_CONFIG"
   fi
 
-  if [ -x "$SCRIPT_DIRECTORY/DEPENDS" ] ; then
-    . "$SCRIPT_DIRECTORY/DEPENDS"
-  fi
+  run_module_file $MODULE DEPENDS
 
 }
 
@@ -167,11 +165,11 @@
                                                                                 
   prepare_depends_status
   grep -q "^"$MODULE"\$" $TEMP_PREPAREDDEPS 2>/dev/null && return 0
-  if  [  -x  $SCRIPT_DIRECTORY/DEPENDS  ];  then
+  if [ -s $SCRIPT_DIRECTORY/DEPENDS ] ; then
     message  "${CHECK_COLOR}Checking dependencies for"  \
              "${MODULE_COLOR}${MODULE}"                   \
              "${DEFAULT_COLOR}"
-    . $SCRIPT_DIRECTORY/DEPENDS
+    run_module_file $MODULE DEPENDS
   fi
 }
 
@@ -210,9 +208,9 @@
     add_depends  "$MODULE"  "$1"  "on"  "required"  "$2"  "$3"
   }
   run_depends() {
-    if  [  -x  $SCRIPT_DIRECTORY/DEPENDS  ];  then
+    if [ -s $SCRIPT_DIRECTORY/DEPENDS ] ; then
       show_fancy_progress "Processing: $MODULE"
-      . $SCRIPT_DIRECTORY/DEPENDS
+      run_module_file $MODULE DEPENDS
     fi
   }
                                                                                 

Index: install.lunar
===================================================================
RCS file: /var/cvs/lunar/theedge/var/lib/lunar/functions/install.lunar,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- install.lunar	13 Jul 2003 20:49:54 -0000	1.2
+++ install.lunar	14 Jul 2003 22:38:20 -0000	1.3
@@ -60,16 +60,14 @@
 
 
 run_conflicts() {
-    if  [  -x  $SCRIPT_DIRECTORY/CONFLICTS  ];  then
-             . $SCRIPT_DIRECTORY/CONFLICTS
-    fi
+  run_module_file $MODULE CONFLICTS
 }
 
 
 # create the dependency files if they do not exist
 prepare_depends_status()  {
-   [ -f $DEPENDS_STATUS ]        || touch  $DEPENDS_STATUS
-   [ -f $DEPENDS_STATUS_BACKUP ] || touch  $DEPENDS_STATUS_BACKUP
+  [ -f $DEPENDS_STATUS ]        || touch  $DEPENDS_STATUS
+  [ -f $DEPENDS_STATUS_BACKUP ] || touch  $DEPENDS_STATUS_BACKUP
 }
 
 
@@ -96,9 +94,7 @@
     fi
   fi
   grep -q "^"$MODULE"\$" $TEMP_PREPAREDDEPS 2>/dev/null && return 0
-  if  [  -x  $SCRIPT_DIRECTORY/CONFIGURE  ];  then
-    . $SCRIPT_DIRECTORY/CONFIGURE
-  fi
+  run_module_file $MODULE CONFIGURE
 }
 
 
@@ -108,8 +104,8 @@
   cd $BUILD_DIRECTORY
 
   if verify_sources ; then
-    if [ -x $SCRIPT_DIRECTORY/PRE_BUILD ] ; then
-      . $SCRIPT_DIRECTORY/PRE_BUILD
+    if [ -s $SCRIPT_DIRECTORY/PRE_BUILD ] ; then
+      run_module_file $MODULE PRE_BUILD
     else
       default_pre_build
     fi
@@ -128,12 +124,6 @@
 }
 
 
-view_compile_log()  {
-    sleep  1
-    report $C_LOG "Compile log"
-}
-
-
 start_logging () {
   export C_LOG=$(temp_create "${MODULE}_compilelog")
   export C_FIFO=$(temp_create "${MODULE}_compilefifo")
@@ -141,19 +131,20 @@
   # just remaking this as FIFO
   rm -f $C_FIFO
   mknod $C_FIFO p
-  echo  "Compile log for  $MODULE  $VERSION  Built on `date  -u`" > $C_LOG
+  echo "Compile log for \"$MODULE\"-\"$VERSION\" Built on \"$(date  -u)\"" > $C_LOG
 
   activate_voyeur
 }
 
 
 activate_voyeur()  {
-  if  [  -z  "$SILENT"  ];  then
-    case  $VOYEUR  in
-      on)  tee  -a  $C_LOG  <  $C_FIFO              &  ;;
-       *)  tee  -a  $C_LOG  <  $C_FIFO  >/dev/null  &  ;;
+  if [ -z "$SILENT" ] ; then
+    case $VOYEUR in
+      on) tee -a $C_LOG < $C_FIFO              & ;;
+       *) tee -a $C_LOG < $C_FIFO >/dev/null   & ;;
     esac
-  else     tee  -a  $C_LOG  <  $C_FIFO  >/dev/null  &
+  else
+    tee -a $C_LOG < $C_FIFO >/dev/null &
   fi
 }
 
@@ -173,31 +164,16 @@
         cat /var/cache/config/$MODULE
       fi
 	  
-      if    query  "Do you wish to add -- options to ./configure?"  n ;  then
-        if [ $EDITOR ]; then
-          if    [ $EDITOR == /usr/bin/emacs ] || \
-                [ $EDITOR == /usr/bin/vi ]    || \
-                [ $EDITOR == /usr/bin/jed ]   || \
-                [ $EDITOR == /usr/bin/ed ]    || \
-                [ $EDITOR == /usr/bin/nano ]   ;    then
-             if [ ! -x $EDITOR ]; then
-               EDITOR=/usr/bin/nano
-             fi
-             else
-               EDITOR=/usr/bin/nano
-           fi
-           else
-           EDITOR=/usr/bin/nano
-         fi
-         $EDITOR /var/cache/config/$MODULE
-         OPTS="$OPTS `cat /var/cache/config/$MODULE`"
-         message "${MESSAGE_COLOR} OPTS= ${MODULE_COLOR}$OPTS"
+      if query "Do you wish to add -- options to ./configure?" n ; then
+        edit_file /var/cache/config/$MODULE
+        OPTS="$OPTS $(cat /var/cache/config/$MODULE)"
+        message "${MESSAGE_COLOR} OPTS= ${MODULE_COLOR}$OPTS"
       fi
     fi
   fi
 
-  if  [  -x  $SCRIPT_DIRECTORY/BUILD  ];  then
-          .  $SCRIPT_DIRECTORY/BUILD
+  if [ -s $SCRIPT_DIRECTORY/BUILD ] ; then
+    run_module_file $MODULE BUILD
   else
     default_build
   fi
@@ -206,16 +182,16 @@
 
 
 run_post_build() {
-  if  [  -x  $SCRIPT_DIRECTORY/POST_BUILD  ];  then
-           . $SCRIPT_DIRECTORY/POST_BUILD
+  if [ -s $SCRIPT_DIRECTORY/POST_BUILD ] ; then
+    run_module_file $MODULE POST_BUILD
   fi
   default_post_build
 }
 
 
 run_post_install() {
-  if  [  -x  $SCRIPT_DIRECTORY/POST_INSTALL  ];  then
-           . $SCRIPT_DIRECTORY/POST_INSTALL
+  if [ -s $SCRIPT_DIRECTORY/POST_INSTALL ] ; then
+    run_module_file $MODULE POST_INSTALL
   fi
 }
 
@@ -246,11 +222,10 @@
 
 
 remove_line()  {
-  F_TMP=/tmp/`basename  $I_LOG`.`uuidgen`
-
-  cp         $I_LOG  $F_TMP
-  grep  -v   $ITEM   $F_TMP  >  $I_LOG
-  rm    -f           $F_TMP
+  F_TMP=$(temp_create "remove-line")
+  cp $I_LOG $F_TMP
+  grep -v $ITEM $F_TMP > $I_LOG
+  temp_destroy $F_TMP
 
   message  "Symbolic link: ${SYMLINK_COLOR}${ITEM}${DEFAULT_COLOR}"  \
            "is owned by ${MODULE_COLOR}${MODULE}${DEFAULT_COLOR}"
@@ -379,11 +354,9 @@
     LC=`cat $TEMP_DOWNLOADLOG 2>/dev/null | wc -l | tr -d ' '`
 
     if [ "$LC" != "$LC_OLD" ] ; then
-      verbose_msg "====== download progess:"
       (( LC_OLD++ ))
       sed  -n ${LC_OLD},${LC}p $TEMP_DOWNLOADLOG
       LC_OLD=$LC
-      verbose_msg "====== end download progress"
     fi
   fi
 }
@@ -391,20 +364,17 @@
 
 show_downloading() {
   if [ -e "$TEMP_DOWNLOADLOG" ] ; then
+    verbose_msg "====== download progess:"
     while ! lget $MODULE >> $TEMP_DOWNLOADLOG 2>&1 ; do
       show_download_progress
       sleep 1
     done
     show_download_progress
+    verbose_msg "====== end download progress"
   fi
 }
 
 
-report_install()  {
-  INST_LOG=$INSTALL_LOGS/$MODULE-$VERSION
-  report  $INST_LOG  "Install log"
-}
-
 
 lin_module()  { (
   # make sure we got all the info
@@ -471,10 +441,10 @@
       if [ -f "$INSTALLWATCHFILE" ] ; then
         temp_destroy $INSTALLWATCHFILE
       fi
-      sound  FAILURE
-      message  "${PROBLEM_COLOR}! Problem detected during \"$LIN_ERROR\" !${DEFAULT_COLOR}"
-      rm  -f  $linING
-      view_compile_log
+      sound FAILURE
+      message "${PROBLEM_COLOR}! Problem detected during \"$LIN_ERROR\" !${DEFAULT_COLOR}"
+      rm -f $linING
+      report $COMPILE_LOGS/$MODULE-$VERSION.bz2 "compile log" $MODULE $VERSION
       activity_log  "lin"  "$MODULE"  "$VERSION"  "failed" "Due to build errors during $LIN_ERROR"
       return 1
     fi  
@@ -492,26 +462,25 @@
     fi
 
     if [ -n "$LIN_ERROR" ] ; then
-      sound  FAILURE
-      message  "${PROBLEM_COLOR}! Problem detected during \"$LIN_ERROR\" !${DEFAULT_COLOR}"
-      rm  -f  $linING
-      view_compile_log
+      sound FAILURE
+      message "${PROBLEM_COLOR}! Problem detected during \"$LIN_ERROR\" !${DEFAULT_COLOR}"
+      rm -f $linING
+      report $COMPILE_LOGS/$MODULE-$VERSION.bz2 "compile log" $MODULE $VERSION
       activity_log  "lin"  "$MODULE"  "$VERSION"  "failed" "Due to build errors during $LIN_ERROR"
       return 1
     fi
 
-    
     rm_source_dir               &&
-    report_install              &&
+    report $INSTALL_LOGS/$MODULE-$VERSION "install log" $MODULE $VERSION &&
     rm -f $linING               &&
-    sound  SUCCESS              &&
+    sound SUCCESS               &&
     activity_log  "lin"  "$MODULE"  "$VERSION"  "success"
 
-    if  [  "$?"  !=  0  ];  then
-      sound  FAILURE
-      message  "${PROBLEM_COLOR}! Problem detected !${DEFAULT_COLOR}"
-      rm  -f  $linING
-      view_compile_log
+    if [ "$?" != 0 ] ; then
+      sound FAILURE
+      message "${PROBLEM_COLOR}! Problem detected !${DEFAULT_COLOR}"
+      rm -f $linING
+      report $COMPILE_LOGS/$MODULE-$VERSION.bz2 "compile log" $MODULE $VERSION
       activity_log  "lin"  "$MODULE"  "$VERSION"  "failed" "Due to build errors during or after $LIN_ERROR"
       return 1
     fi

Index: messages.lunar
===================================================================
RCS file: /var/cvs/lunar/theedge/var/lib/lunar/functions/messages.lunar,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- messages.lunar	23 Apr 2003 19:54:17 -0000	1.5
+++ messages.lunar	14 Jul 2003 22:38:20 -0000	1.6
@@ -39,27 +39,27 @@
 }
 
 
+# function : report FILE [description] MODULE VERSION
 report() {
-  if  [  ! -f  "$1"  ]; then
+  if [ ! -f "$1" ] ; then
     return
   fi
 
-  if  [  "$VIEW_REPORTS"  ==  "on"  ];  then
-    VIEW_PROMPT="View $2 for ${MODULE_COLOR}${MODULE}-${VERSION_COLOR}${VERSION}${DEFAULT_COLOR}?"
-    sound  REPORT
-    if  query  "$VIEW_PROMPT" n; then
+  if [ "$VIEW_REPORTS" == "on" ] ; then
+    sound REPORT
+    if query "View $2 for ${MODULE_COLOR}${3}-${VERSION_COLOR}${4}${DEFAULT_COLOR}${QUERY_COLOR} ?" n ; then
       view_file $1
     fi
   fi
 
-  if  [  "$MAIL_REPORTS"  ==  "on"  ];  then
-    MAILTEMP="/tmp/lunar.mail.`uuidgen`" 
-    date  -u  > $MAILTEMP
-    echo     >> $MAILTEMP
-    cat $1   >> $MAILTEMP
-    mail  -s  "Lunar Report from $HOSTNAME : $2 for $MODULE-$VERSION"  \
-              $ADMIN  < $MAILTEMP  2>/dev/null
-    rm -f $MAILTEMP 2>/dev/null
+  if [ "$MAIL_REPORTS" == "on" ] ; then
+    TMP_MAIL=$(temp_create "mailreport")
+    date -u > $TMP_MAIL
+    echo >> $TMP_MAIL
+    view_file $1 >> $TMP_MAIL
+    mail -s "Lunar Report from $HOSTNAME : $2 for $3-$4"  \
+              $ADMIN < $TMP_MAIL 2>/dev/null
+    temp_destroy $TMP_MAIL
   fi
 
   true

Index: modules.lunar
===================================================================
RCS file: /var/cvs/lunar/theedge/var/lib/lunar/functions/modules.lunar,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- modules.lunar	13 Jul 2003 20:49:54 -0000	1.20
+++ modules.lunar	14 Jul 2003 22:38:20 -0000	1.21
@@ -8,7 +8,6 @@
 # $FUNCTIONS/modules                                       #
 # includes create_module_index, find_section               #
 #          list_sections, list_modules, list_installed     #
-#          get_moonbase_md5, set_moonbase_md5,             #
 #          check_module_index, run_details                 #
 #          module_installed, module_held, module_exiled    #
 #          hold_modules, unhold_modules                    #
@@ -84,28 +83,6 @@
 }
 
 
-# function : set_moonbase_md5
-# usage    : set_moonbase_md5
-# purpose  : creates the md5 value of overall moonbase
-set_moonbase_md5() {
-  MOONBASE_MD5=$(echo $MOONBASE/*/* | md5sum | cut -d "-" -f 1-1)
-  echo $MOONBASE_MD5
-}
-
-
-# function : get_moonbase_md5
-# usage    : get_moonbase_md5
-# purpose  : graps the MOONBASE_MD5 line from the $MODULE_INDEX
-get_moonbase_md5() {
-  MOONBASE_MD5=$(grep ^MOONBASE_MD5: $MODULE_INDEX | tail -1 2>/dev/null | \
-                cut -d : -f 2-2)
-  if [ -z "$MOONBASE_MD5" ] ; then
-    MOONBASE_MD5="0"
-  fi
-  echo "$MOONBASE_MD5"
-}
-
-
 # function: create_module_index
 # usage   : create_module_index
 # purpose : created an index file of module:section pair list
@@ -122,15 +99,13 @@
 
   lock_file $MODULE_INDEX || return 1
 
-  if [ -f "$MODULE_INDEX" ] ; then
-    cp $MODULE_INDEX /tmp
-    rm -f $MODULE_INDEX 2>/dev/null
-  fi
+  rm -f $MODULE_INDEX 2>/dev/null
 
   echo MOONBASE_MD5:`set_moonbase_md5` > $MODULE_INDEX
   for SECTION in $(list_sections) ; do
     list_modules $SECTION | sed "s/$/:$SECTION/" >> $MODULE_INDEX
   done
+
   unlock_file $MODULE_INDEX
 }  
 
@@ -204,7 +179,7 @@
     fi
    
     SCRIPT_DIRECTORY=$MOONBASE/$SECTION/$1
-    . $SCRIPT_DIRECTORY/DETAILS &>/dev/null &&
+    run_module_file $1 DETAILS &> /dev/null &&
     SOURCE_DIRECTORY=${SOURCE_DIRECTORY:-$BUILD_DIRECTORY/$1-$VERSION}
     MODULE_CONFIG=${MODULE_CONFIG:-$DEPENDS_CONFIG/$1}
 
@@ -214,13 +189,17 @@
 
 
 # function : run_module_file
-# usage    : run_module_file <script_name> SCRIPT_DIRECTORY MUST be predefined
+# usage    : run_module_file $MODULE $SCRIPTNAME 
 # purpose  : runs the given script for a pre-defined module
 run_module_file() {
-  [ -z "$SCRIPT_DIRECTORY" ]  && return 1
-  [ -s "$SCRIPT_DIRECTORY/$1" ] || return 1
-  verbose_msg "running \"$MODULE\" \"$1\" file"
-  [ "$TEST" != "on" ] && . $SCRIPT_DIRECTORY/$1 > /dev/null
+  if [ -z "$SCRIPT_DIRECTORY" ] ; then
+    if ! run_details $1 &> /dev/null ; then
+      return 1
+    fi
+  fi
+  if [ -x "$SCRIPT_DIRECTORY/$2" ] ; then
+    . $SCRIPT_DIRECTORY/$2
+  fi    
 }
 
 

Index: moonbase.lunar
===================================================================
RCS file: /var/cvs/lunar/theedge/var/lib/lunar/functions/moonbase.lunar,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- moonbase.lunar	13 Jul 2003 20:49:54 -0000	1.8
+++ moonbase.lunar	14 Jul 2003 22:38:20 -0000	1.9
@@ -56,15 +56,44 @@
             "${DEFAULT_COLOR}${MESSAGE_COLOR}${DEFAULT_COLOR}"
     add_module $MODULE installed $VERSION $(du -hs $SYSTEM_MOONBASE | cut -f1)
     
+    # get ready to regenerate the module index cache file
+    TMP_MODULE_INDEX=$(temp_create "module-index")
+    cp $MODULE_INDEX $TMP_MODULE_INDEX
     if [ -f $MODULE_INDEX ]; then
       rm -f $MODULE_INDEX
     fi
     create_module_index
     echo -e "${MESSAGE_COLOR}Created ${FILE_COLOR}${MODULE_INDEX}" \
             "${DEFAULT_COLOR}${MESSAGE_COLOR}${DEFAULT_COLOR}"
+    display_moonbase_changes
   else
     OUTCOME=failed
     INFO="Could not download a fresh moonbase"
   fi
   activity_log "lin" "moonbase" "$VERSION" "$OUTCOME" "$INFO"
 )}
+
+
+# function : set_moonbase_md5
+# usage    : set_moonbase_md5
+# purpose  : creates the md5 value of overall moonbase
+set_moonbase_md5() {
+  MOONBASE_MD5=$(echo $MOONBASE/*/* | md5sum | cut -d "-" -f 1-1)
+  echo $MOONBASE_MD5
+}
+
+
+# function : get_moonbase_md5
+# usage    : get_moonbase_md5
+# purpose  : graps the MOONBASE_MD5 line from the $MODULE_INDEX
+get_moonbase_md5() {
+  MOONBASE_MD5=$(grep ^MOONBASE_MD5: $MODULE_INDEX | tail -1 2>/dev/null | \
+                cut -d : -f 2-2)
+  if [ -z "$MOONBASE_MD5" ] ; then
+    MOONBASE_MD5="0"
+  fi
+  echo "$MOONBASE_MD5"
+}
+
+
+

Index: updatelog.lunar
===================================================================
RCS file: /var/cvs/lunar/theedge/var/lib/lunar/functions/updatelog.lunar,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- updatelog.lunar	13 Jul 2003 20:49:54 -0000	1.9
+++ updatelog.lunar	14 Jul 2003 22:38:20 -0000	1.10
@@ -25,7 +25,6 @@
     if [ -e "$TMP_LIN_SUCCESS" -a -e "$TMP_LIN_FAIL" ] ; then 
       display_success_info
     fi
-    display_moonbase_changes
   } | tee /var/log/lunar/update 
 }
 
@@ -62,29 +61,21 @@
 # usage    : display_moonbase_changes
 # purpose  : display a list of modules added or removed during this update
 display_moonbase_changes()  {  
-
-  MODULE_INDEX_BACKUP=/tmp/`basename $MODULE_INDEX`
-  
-  if [ -e "$MODULE_INDEX" ] && [ -e "$MODULE_INDEX_BACKUP" ]; then
-
-    NEW_MODULES=`diff -I MOONBASE_MD5 $MODULE_INDEX $MODULE_INDEX_BACKUP | grep '<' | wc -l`
-    DEL_MODULES=`diff -I MOONBASE_MD5 $MODULE_INDEX $MODULE_INDEX_BACKUP | grep '>' | wc -l`
+  if [ -e "$MODULE_INDEX" ] && [ -e "$TMP_MODULE_INDEX" ]; then
+    NEW_MODULES=$(diff -I MOONBASE_MD5 $MODULE_INDEX $TMP_MODULE_INDEX | grep '<' | wc -l)
+    DEL_MODULES=$(diff -I MOONBASE_MD5 $MODULE_INDEX $TMP_MODULE_INDEX | grep '>' | wc -l)
   
     if [ "$NEW_MODULES" != "0" ]; then
       message "${MESSAGE_COLOR}New modules:${DEFAULT_COLOR}"
-      diff -I "MOONBASE_MD5:" $MODULE_INDEX $MODULE_INDEX_BACKUP | grep '<' | cut -d \  -f 2 -
+      diff -I "MOONBASE_MD5:" $MODULE_INDEX $TMP_MODULE_INDEX | grep '<' | cut -d \  -f 2 -
       message
     fi
 
     if [ "$DEL_MODULES" != "0" ]; then
       message "${MESSAGE_COLOR}Removed modules:${DEFAULT_COLOR}"
-      diff -I "MOONBASE_MD5:" $MODULE_INDEX $MODULE_INDEX_BACKUP | grep '>' | cut -d \  -f 2 -
+      diff -I "MOONBASE_MD5:" $MODULE_INDEX $TMP_MODULE_INDEX | grep '>' | cut -d \  -f 2 -
       message
     fi
-
-    rm -f $MODULE_INDEX_BACKUP
-
   fi
-  
 }
 




More information about the Lunar-commits mailing list