X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=bootstrap.sh;h=25cc175a1717d53553bfc5f86064456933b2bc6c;hb=4032d474f0f6fb97d2607e8b5ea5c21f1588cb55;hp=6f6821b765ff3fe10ab1650f868c6fb413e1f232;hpb=2004cb431a9b1c85e40d67cdb743aae2b7d9b23c;p=awesomized%2Flibmemcached

diff --git a/bootstrap.sh b/bootstrap.sh
index 6f6821b7..25cc175a 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -191,6 +191,9 @@ set_VENDOR_DISTRIBUTION ()
     opensuse)
       VENDOR_DISTRIBUTION='opensuse'
       ;;
+    arch)
+      VENDOR_DISTRIBUTION='arch'
+      ;;
     *)
       die "attempt to set an invalid VENDOR_DISTRIBUTION=$dist"
       ;;
@@ -262,11 +265,14 @@ set_VENDOR_RELEASE ()
     opensuse)
       VENDOR_RELEASE="$release"
       ;;
+    arch)
+      VENDOR_RELEASE=""
+      ;;
     unknown)
       die "attempt to set VENDOR_RELEASE without setting VENDOR_DISTRIBUTION"
       ;;
     *)
-      die "attempt to set with an invalid VENDOR_DISTRIBUTION=$VENDOR_DISTRIBUTION"
+      die "attempt to set VENDOR_RELEASE with an invalid VENDOR_DISTRIBUTION=$VENDOR_DISTRIBUTION"
       ;;
   esac
 }
@@ -311,8 +317,11 @@ set_VENDOR ()
     suse)
       VENDOR='suse'
       ;;
+    arch)
+      VENDOR='arch'
+      ;;
     *)
-      die "An attempt was made to set an invalid VENDOR=$_vendor"
+      die "An attempt was made to set an invalid VENDOR=$vendor"
       ;;
   esac
 
@@ -372,7 +381,7 @@ determine_target_platform ()
   elif [[ -x '/usr/bin/lsb_release' ]]; then 
     local _ID="$(/usr/bin/lsb_release -s -i)"
     local _VERSION="$(/usr/bin/lsb_release -s -r)"
-    set_VENDOR $_ID $_ID $_VERSION_ID
+    set_VENDOR $_ID $_ID $_VERSION
   elif [[ -f '/etc/lsb-release' ]]; then 
     source '/etc/lsb-release'
     set_VENDOR 'canonical' $DISTRIB_ID $DISTRIB_CODENAME
@@ -1010,17 +1019,16 @@ make_rpm ()
 {
   if command_exists 'rpmbuild'; then
     if [ -f 'rpm.am' -o -d 'rpm' ]; then
-      mkdir -p ~/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
-      mkdir -p ~/rpmbuild/RPMS/{i386,i486,i586,i686,noarch,athlon}
-
       run_configure_if_required
       make_target 'dist-rpm'
 
-      mkdir artifacts
-      cp *gz *rpm artifacts
-
       if $jenkins_build_environment; then
-        make_target 'clean'
+        mkdir artifacts
+        mv *.tar.gz *.rpm artifacts
+
+        make_target 'maintainer-clean'
+        mv artifacts/* .
+        rmdir artifacts
       fi
 
     fi