[Lunar-commits] r14543 - lunar/branches/stable/bin

[Auke Kok]

Author: sofar
Date: 2005-04-30 22:00:13 +0000 (Sat, 30 Apr 2005)
New Revision: 14543

Modified:
   lunar/branches/stable/bin/lvu
Log:
Merging lvu submit code back as well.


Modified: lunar/branches/stable/bin/lvu
===================================================================
--- lunar/branches/stable/bin/lvu	2005-04-30 21:46:52 UTC (rev 14542)
+++ lunar/branches/stable/bin/lvu	2005-04-30 22:00:13 UTC (rev 14543)
@@ -739,66 +739,64 @@
       message "submit requires an existing module"
       exit 1
   else
-    if ! echo $SECTION | grep -q '^zlocal' ; then
-      message "submit requires the module to be in section 'zlocal'"
-      exit 1
+    if echo $SECTION | grep -q '^zlocal' ; then
+      SECTION=" "
+    fi
+    TMP_MSG=$(temp_create "submission")
+    (
+      echo '# MODULE SUBMISSION TEMPLATE'
+      echo '# --------------------------'
+      echo '# '
+      echo '# (all lines starting with # will be deleted before sending)'
+      echo '# Please fill in the fields as complete as possible to help'
+      echo '# developers track the status of your module'
+      echo '# '
+      echo '# PLEASE DO NOT CHANGE THE FOLLOWING FIELDS:'
+      echo 'To: lunar at lunar-linux.org'
+      echo 'Date:' $(date)
+      echo 'Subject: Module submission -' $MODULE
+      echo '# '
+      echo '# YOUR E_MAIL ADDRESS MUST BE VALID:'
+      echo 'From: '
+      echo '#Reply-To:'
+      echo '#Cc: '
+      echo '# PLEASE DO NOT ADD WHITESPACE ABOVE THIS LINE'
+      echo ''
+      echo '# '
+      echo '# Please fill in some of the following information if applicable:'
+      echo '# '
+      echo 'module name       :' $MODULE
+      echo 'suggested section :' $SECTION
+      echo 'update (y/n)      : n'
+      echo 'bugfix (y/n)      : n'
+      echo 'security (y/n)    : n'
+      echo ''
+      echo '# '
+      echo '# Add additional information, hints, comments below here,'
+      echo '# if you entered "y" in one of the fields above, please explain!'
+      echo '# '
+      echo ''
+      echo '# YOUR NAME HERE'
+      echo ''
+      echo '# '
+      echo '# Below is your module. Please do not change the format'
+      echo '# '
+      cd $SCRIPT_DIRECTORY
+      for FILE in $(find . -type f | grep -v 'CVS/' | sed 's/\.\///g'); do
+        echo "==================== BEGIN $FILE ===================="
+        cat $FILE
+        echo "===================== END $FILE ====================="
+        echo ""
+      done
+    ) > $TMP_MSG
+    edit_file $TMP_MSG
+    cat $TMP_MSG | grep -v '^#'
+    if query "Submit this module now?" y; then
+      RECIPIENT=$(grep -m 1 '^To: ' $TMP_MSG | sed 's/^To: //')
+      cat $TMP_MSG | grep -v '^#' | sendmail $RECIPIENT
+      temp_destroy $TMP_MSG
     else
-      TMP_MSG=$(temp_create "submission")
-      (
-        echo '# MODULE SUBMISSION TEMPLATE'
-	echo '# --------------------------'
-	echo '# '
-	echo '# (all lines starting with # will be deleted before sending)'
-	echo '# Please fill in the fields as complete as possible to help'
-	echo '# developers track the status of your module'
-	echo '# '
-	echo '# PLEASE DO NOT CHANGE THE FOLLOWING FIELDS:'
-	echo 'To: lunar at lunar-linux.org'
-	echo 'Date:' $(date)
-	echo 'Subject: Module submission -' $MODULE
-	echo '# '
-	echo '# YOUR E_MAIL ADDRESS MUST BE VALID:'
-	echo 'From: '
-	echo '#Reply-To:'
-	echo '#Cc: '
-	echo '# PLEASE DO NOT ADD WHITESPACE ABOVE THIS LINE'
-	echo ''
-	echo '# '
-	echo '# Please fill in some of the following information if applicable:'
-	echo '# '
-	echo 'module name       :' $MODULE
-	echo 'suggested section : '
-	echo 'update (y/n)      : n'
-	echo 'bugfix (y/n)      : n'
-	echo 'security (y/n)    : n'
-	echo ''
-	echo '# '
-	echo '# Add additional information, hints, comments below here,'
-	echo '# if you entered "y" in one of the fields above, please explain!'
-	echo '# '
-	echo ''
-	echo '# YOUR NAME HERE'
-	echo ''
-	echo '# '
-	echo '# Below is your module. Please do not change the format'
-	echo '# '
-        cd $SCRIPT_DIRECTORY
-        for FILE in $(find . -type f | grep -v 'CVS/' | sed 's/\.\///g'); do
-          echo "==================== BEGIN $FILE ===================="
-	  cat $FILE
-          echo "===================== END $FILE ====================="
-	  echo ""
-        done
-      ) > $TMP_MSG
-      edit_file $TMP_MSG
-      cat $TMP_MSG | grep -v '^#'
-      if query "Submit this module now?" y; then
-        RECIPIENT=$(grep -m 1 '^To: ' $TMP_MSG | sed 's/^To: //')
-        cat $TMP_MSG | grep -v '^#' | sendmail $RECIPIENT
-        temp_destroy $TMP_MSG
-      else
-        message "Submission aborted. your submission was saved as $TMP_MSG"
-      fi
+      message "Submission aborted. your submission was saved as $TMP_MSG"
     fi
   fi
 }