minor fixes

git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@538 04377dda-e619-0410-9926-eae83683ac58

diff --git a/trunk/lib/common.sh b/trunk/lib/common.sh
index 38afca866d6bcde2f008b3b2f7a71f21f78dcfaf..c542e196d9e8929d2b567f7267f3fb3027ab8e27 100644 (file)
--- a/trunk/lib/common.sh
+++ b/trunk/lib/common.sh
@@ -306,22 +306,6 @@ function eval_config {
 #           arch and version functions
 # -----------------------------------------------
 
-function default_distro {
-
-  # get distro name from /etc/slackware-version
-  if [ -f "$1/etc/slamd64-version" ]; then
-    echo Slamd64
-  elif [ -f "$1/etc/bluewhite64-version" ]; then
-    echo Bluewhite64
-  elif [ -f "$1/etc/sflack-version" ]; then
-    echo Sflack
-  elif [ -f "$1/etc/slackware-version" ]; then
-    cat $1/etc/slackware-version | awk '{ print $1 }'
-  else
-    echo Slackware
-  fi
-}
-
 function default_version {
 
   # get version from /etc/slackware-version
@@ -366,6 +350,29 @@ function default_arch {
 
 }
 
+function default_distro {
+
+  # get distro name from /etc/slackware-version
+  if [ "`default_arch`" == "x86_64" ]; then
+    if [ -f "$1/etc/slamd64-version" ]; then
+      echo slamd64
+    elif [ -f "$1/etc/bluewhite64-version" ]; then
+      echo bluewhite64
+    elif [ -f "$1/etc/sflack-version" ]; then
+      echo sflack
+    else
+      echo slamd64
+    fi
+  else
+    if [ -f "$1/etc/slackware-version" ]; then
+      cat $1/etc/slackware-version | awk '{ print $1 }'
+    else
+      echo slackware
+    fi
+  fi
+
+}
+
 # -----------------------------------------------
 #              template functions
 # -----------------------------------------------