[Lunar-commits] <lunar> Fixed a few issues with the moonbase selection

[Stefan Wold]

commit 5e1d66448fd6461a9ae22720054c879d4eaba384
Author: Stefan Wold <ratler at lunar-linux.org>
Date:   Sat Mar 17 19:14:25 2012 +0100

    Fixed a few issues with the moonbase selection
    
    - Default moonbase is now stable
---
 etc/lunar/config                       |    1 +
 sbin/lunar                             |    1 -
 var/lib/lunar/functions/moonbase.lunar |    6 +++---
 var/lib/lunar/unset.sh                 |    2 ++
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/etc/lunar/config b/etc/lunar/config
index d44acd0..2ae6682 100755
--- a/etc/lunar/config
+++ b/etc/lunar/config
@@ -9,6 +9,7 @@ export        DIALOGRC=/etc/lunar/dialogrc
                MIRRORS=/etc/lunar/mirrors
 
          LUNAR_MODULES="lunar theedge"
+        MOONBASE_TYPES="stable unstable"
 
        BUILD_DIRECTORY=/usr/src
     DOCUMENT_DIRECTORY=/usr/share/doc
diff --git a/sbin/lunar b/sbin/lunar
index 3d08d71..5d68770 100755
--- a/sbin/lunar
+++ b/sbin/lunar
@@ -787,7 +787,6 @@ main() {
 
   export IFS="$TAB_ENTER_IFS"
 
-  MOONBASE_TYPE=${MOONBASE_TYPE:-stable}
   LUNAR_MODULE=${LUNAR_MODULE:-lunar}
   LUNAR_VERSION=$(run_details $LUNAR_MODULE && echo $UPDATED)
 
diff --git a/var/lib/lunar/functions/moonbase.lunar b/var/lib/lunar/functions/moonbase.lunar
index dfbc50c..305a0ed 100644
--- a/var/lib/lunar/functions/moonbase.lunar
+++ b/var/lib/lunar/functions/moonbase.lunar
@@ -28,10 +28,10 @@ get_moonbase () {
     debug_msg "  run_details ($@)"
         MODULE=moonbase
        VERSION=`date -u +%Y%m%d.%H`
-    if [ "$MOONBASE_TYPE" == "stable" ]; then
-        SOURCE=$MODULE-stable.tar.bz2
-    else
+    if [ "$MOONBASE_TYPE" == "unstable" ]; then
         SOURCE=$MODULE.tar.bz2
+    else
+        SOURCE=$MODULE-stable.tar.bz2
     fi
     SOURCE_URL=$MOONBASE_URL
        PARTIAL=off
diff --git a/var/lib/lunar/unset.sh b/var/lib/lunar/unset.sh
index 5239487..a48b40c 100644
--- a/var/lib/lunar/unset.sh
+++ b/var/lib/lunar/unset.sh
@@ -62,6 +62,8 @@ unset MODULE_INDEX
 unset MODULE_STATUS
 unset MODULE_STATUS_BACKUP
 unset MOONBASE
+unset MOONBASE_TYPE
+unset MOONBASE_TYPES
 unset MOONBASE_URL
 unset PATCH_URL
 unset PLATFORM