[sheepdog] [SHEEPDOG-UTILS][PATCH v2] Set different list of packages for debian 8

[Hitoshi Mitake]

At Mon, 25 May 2015 09:10:08 +0200,
Valerio Pachera wrote:
> 
> This patch add the package yasm to be installed in both debian 7
> and debian 8.
> liburcu2 will be insalled instead of liburcu1 in debian 8.
> It also fixed an error message that didn't get printed and
> add libtool as required package.
> 
> Signed-off-by: Valerio Pachera <sirio81 at gmail.com>
> ---
>  install.sh | 23 +++++++++++++++++++----
>  1 file changed, 19 insertions(+), 4 deletions(-)

Applied, thanks.
# I'll fix the problem of your permission ASAP, sorry...

Hitoshi

> 
> diff --git a/install.sh b/install.sh
> index 25f85ea..1e2cdfd 100755
> --- a/install.sh
> +++ b/install.sh
> @@ -5,9 +5,6 @@ set -o pipefail
>  # Use 'git branch -a' to get the full branch list
>  branch='master'
>  dpkg_installed='/tmp/installed_packages.list'
> -dpkg_required='automake pkg-config liburcu1 liburcu-dev zlib1g zlib1g-dev
> -libglib2.0-dev libpixman-1-dev groff build-essential git libzookeeper-mt-dev
> -apt-show-versions parted'
>  sheep_url='https://github.com/sheepdog/sheepdog.git'
>  qemu_url='git://github.com/qemu/qemu.git'
>  qemu_src_dir='/usr/src/qemu'
> @@ -19,6 +16,8 @@ zookeeper_id_file='/etc/zookeeper/conf/myid'
>  cores=$(grep -c processor /proc/cpuinfo)
>  script_dir=$(basename $0)
>  ulimit=1024000
> +[ -f /etc/debian_version ] && \
> +debian_version=$(cat /etc/debian_version | awk -F '.' '{print $1}')
>  
>  zookeeper_conf='tickTime=2000
>  initLimit=10
> @@ -43,6 +42,22 @@ question[0]='Would you like to run sheepdog-assistant?'
>  question[1]="It's recommended to update your system (aptitude safe-upgrade),
>  bofore installing sheepdog. Would you like to do it now?"
>  
> +[ -z "$debian_version" ] && \
> +dpkg_required='automake pkg-config liburcu2 liburcu-dev zlib1g zlib1g-dev
> +libglib2.0-dev libpixman-1-dev groff build-essential git libzookeeper-mt-dev
> +apt-show-versions parted yasm libttol'
> +
> +[ $debian_version == 7 ] && \
> +dpkg_required='automake pkg-config liburcu1 liburcu-dev zlib1g zlib1g-dev
> +libglib2.0-dev libpixman-1-dev groff build-essential git libzookeeper-mt-dev
> +apt-show-versions parted yasm libtool'
> +
> +[ $debian_version == 8 ] && \
> +dpkg_required='automake pkg-config liburcu2 liburcu-dev zlib1g zlib1g-dev
> +libglib2.0-dev libpixman-1-dev groff build-essential git libzookeeper-mt-dev
> +apt-show-versions parted yasm libtool'
> +
> +
>  help () {
>  cat << EOF
>  
> @@ -131,7 +146,7 @@ get_dpck_list () {
>  check_installed_packages () {
>      for package in $@
>      do
> -        grep $package $dpkg_installed > /dev/null || error ${error[0]}
> +        grep $package $dpkg_installed > /dev/null || error "${error[0]}"
>      done
>  }
>  
> -- 
> 2.1.4
> 
> -- 
> sheepdog mailing list
> sheepdog at lists.wpkg.org
> https://lists.wpkg.org/mailman/listinfo/sheepdog