X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=bootstrap.sh;h=25cc175a1717d53553bfc5f86064456933b2bc6c;hb=9351ece659f57ee704b5f0ccfd4b531677ff36f8;hp=c4418fdcc7c6c62025e1938d718812059ce2d0ec;hpb=8c406df883b9d49abe134b4bd74afc102019df8e;p=awesomized%2Flibmemcached diff --git a/bootstrap.sh b/bootstrap.sh index c4418fdc..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 @@ -1015,7 +1024,7 @@ make_rpm () if $jenkins_build_environment; then mkdir artifacts - mv *gz *rpm artifacts + mv *.tar.gz *.rpm artifacts make_target 'maintainer-clean' mv artifacts/* .