simplaret: deleted simplaret_distro_folder; also solved #11; small changes at generic.mkSlackBuild

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

1 files changed, 31 insertions, 23 deletions

diff --git a/trunk/lib/common.sh b/trunk/lib/common.sh
index 5a2cb35..2fcdb12 100644
--- a/trunk/lib/common.sh
+++ b/trunk/lib/common.sh
@@ -41,8 +41,7 @@ function package_version {
   local file pack version
   file="`basename $1`"
   pack="`package_name $1`"
-  version="`echo $file | sed -e "s/^$pack-//" | cut -d "-" -f 1`"
-  echo $version
+  echo $file | sed -e "s/^$pack-//" | cut -d "-" -f 1
 
 }
 
@@ -50,10 +49,7 @@ function package_arch {
 
   # get ARCH from a package name
   local file pack arch
-  file="`basename $1`"
-  pack="`package_name $1`"
-  arch="`echo $file | sed -e "s/^$pack-//" | cut -d "-" -f 2`"
-  echo $arch
+  echo `basename $1` | sed -e 's/.*\-\(.*\)\-.*.tgz$/\1/' -e 's/_slamd64$//g' -e 's/_sflack$//g'
 
 }
 
@@ -61,10 +57,7 @@ function package_build {
 
   # get BUILD from a package name
   local file pack build
-  file="`basename $1 .tgz`"
-  pack="`package_name $1`"
-  build="`echo $file | sed -e "s/^$pack-//" | cut -d "-" -f 3`"
-  echo $build
+  echo `basename $1` | sed -e 's/.*\-.*\-\(.*\).tgz$/\1/'
 
 }
 
@@ -310,10 +303,13 @@ function default_version {
   # get version from /etc/slackware-version
   if [ -f "$1/etc/slackware-version" ]; then
     cat $1/etc/slackware-version | awk '{ print $2 }' | sed -e 's/.0$//'
+  elif [ -f "$1/etc/slamd64-version" ]; then
+    cat $1/etc/slamd64-version | awk '{ print $2 }' | sed -e 's/.0$//'
+  elif [ -f "$1/etc/bluewhite64-version" ]; then
+    cat $1/etc/bluewhite64-version | awk '{ print $2 }' | sed -e 's/.0$//'
   else
     aaa_base="`basename $(ls $1/var/log/packages/aaa_base-[0-9]* 2> /dev/null)`"
-    pack="`basename $aaa_base | sed -e 's/-[^-]*-[^-]*-[^-]*$//'`"
-    echo $aaa_base | sed -e "s/^$pack-//" | cut -d "-" -f 1 | sed -e 's/.0$//'
+    echo `package_version $aaa_base`
   fi
 
 }
@@ -323,7 +319,17 @@ function default_arch {
   # get arch from /etc/slackware-version
 
   local arch
-  arch="`cat $1/etc/slackware-version | awk '{ print $3 }' | sed -e 's/(//' -e 's/)//'`"
+
+  if [ -f "$1/etc/slackware-version" ]; then
+    arch="`cat $1/etc/slackware-version | awk '{ print $3 }' | sed -e 's/(//' -e 's/)//'`"
+  elif [ -f "$1/etc/slamd64-version" ]; then
+    arch="`cat $1/etc/slamd64-version | awk '{ print $3 }' | sed -e 's/(//' -e 's/)//'`"
+  elif [ -f "$1/etc/bluewhite64-version" ]; then
+    arch="`cat $1/etc/bluewhite64-version | awk '{ print $3 }' | sed -e 's/(//' -e 's/)//'`"
+  else
+    aaa_base="`basename $(ls $1/var/log/packages/aaa_base-[0-9]* 2> /dev/null)`"
+    echo `package_arch $aaa_base`
+  fi  
 
   if [ -z "$arch" ]; then
     echo `uname -m`
@@ -660,13 +666,13 @@ function gen_meta {
     return;
   fi
 
-  NAME=$(echo $1|sed -re "s/(.*\/)(.*.tgz)$/\2/")
-  LOCATION=$(echo $1|sed -re "s/(.*)\/(.*.tgz)$/\1/")
-  SIZE=$( expr `gunzip -l $1 | tail -n 1|awk '{print $1}'` / 1024 )
-  USIZE=$( expr `gunzip -l $1 | tail -n 1|awk '{print $2}'` / 1024 )
-  REQUIRED=$(tar xzfO $1 install/slack-required 2>/dev/null|xargs -r -iZ echo -n "Z,"|sed -e "s/,$//")
-  CONFLICTS=$(tar xzfO $1 install/slack-conflicts 2>/dev/null|xargs -r -iZ echo -n "Z,"|sed -e "s/,$//")
-  SUGGESTS=$(tar xzfO $1 install/slack-suggests 2>/dev/null|xargs -r )
+  NAME=$(echo $1 | sed -re "s/(.*\/)(.*.tgz)$/\2/")
+  LOCATION=$(echo $1 | sed -re "s/(.*)\/(.*.tgz)$/\1/")
+  SIZE=$( expr `gunzip -l $1 | tail -n 1 | awk '{print $1}'` / 1024 )
+  USIZE=$( expr `gunzip -l $1 | tail -n 1 | awk '{print $2}'` / 1024 )
+  REQUIRED=$(tar xzfO $1 install/slack-required 2>/dev/null | xargs -r -iZ echo -n "Z," | sed -e "s/,$//")
+  CONFLICTS=$(tar xzfO $1 install/slack-conflicts 2>/dev/null | xargs -r -iZ echo -n "Z," | sed -e "s/,$//")
+  SUGGESTS=$(tar xzfO $1 install/slack-suggests 2>/dev/null | xargs -r )
   METAFILE=${NAME%tgz}meta
 
   echo "PACKAGE NAME:  $NAME" > $LOCATION/$METAFILE
@@ -683,7 +689,7 @@ function gen_meta {
   echo "PACKAGE SUGGESTS:  $SUGGESTS" >> $LOCATION/$METAFILE
   echo "PACKAGE DESCRIPTION:" >> $LOCATION/$METAFILE
 
-  tar xzfO $1 install/slack-desc | grep -E '\w+\:'|grep -v '^#' >> $LOCATION/$METAFILE
+  tar xzfO $1 install/slack-desc | grep -E '\w+\:' | grep -v '^#' >> $LOCATION/$METAFILE
 
   echo "" >> $LOCATION/$METAFILE
 
@@ -692,6 +698,7 @@ function gen_meta {
 # -----------------------------------------------
 #                 Error functions
 # -----------------------------------------------
+
 function error_codes {
 
   # Slackbuilds error codes ** not change **
@@ -817,6 +824,7 @@ function handle_error {
 # -----------------------------------------------
 #                 svn functions
 # -----------------------------------------------
+
 function build_repo {
 
   # Checkout a new slackbuild working copy
@@ -883,7 +891,7 @@ function color_select {
     messag="\033[32;1m" # blue
     error="\033[31;1m" # red
     alert="\033[33;1m" # yellow
-    normal="\033[m"       # normal
+    normal="\033[m" # normal
     ;;
   *)
     commun=""
@@ -914,6 +922,6 @@ function is_number {
         return 1
     else
         (let int=$1)  2>/dev/null
-        return $?       # Exit status of the let thread
+        return $? # Exit status of the let thread
     fi
 }