From 6f0083dd8e01e0fcdfecd9c1da80cf04ae48e242 Mon Sep 17 00:00:00 2001
From: GONG Jie <gongjie@linux.vnet.ibm.com>
Date: Thu, 16 Jun 2016 11:44:08 +0800
Subject: [PATCH 1/5] A tool to install xCAT automatically

---
 xCAT-server/share/xcat/tools/go-xcat | 946 +++++++++++++++++++++++++++
 1 file changed, 946 insertions(+)
 create mode 100755 xCAT-server/share/xcat/tools/go-xcat

diff --git a/xCAT-server/share/xcat/tools/go-xcat b/xCAT-server/share/xcat/tools/go-xcat
new file mode 100755
index 000000000..69077f5cf
--- /dev/null
+++ b/xCAT-server/share/xcat/tools/go-xcat
@@ -0,0 +1,946 @@
+#!/bin/bash
+
+function usage()
+{
+	local script="${0##*/}"
+
+	while read ; do echo "${REPLY}" ; done <<-EOF
+	Usage: ${script} [--install]
+
+	Options:
+	  --help                        display this help and exit
+	  --install                     installs all the latest versions from the
+	                                repository
+	  --xcat-version=[VERSION]      specify the version of xCAT
+	  -y, --yes                     answer yes for all questions
+
+	Examples:
+
+	  ${script}
+	  ${script} --install
+	  ${script} --install --yes
+	  ${script} --install --xcat-version=2.12 --yes
+	EOF
+}
+
+PATH="/usr/sbin:/usr/bin:/sbin:/bin"
+export PATH
+
+#
+# warn_if_bad		Put out warning message(s) if $1 has bad RC.
+#
+#	$1	0 (pass) or non-zero (fail).
+#	$2+	Remaining arguments printed only if the $1 is non-zero.
+#
+#	Incoming $1 is returned unless it is 0
+#
+function warn_if_bad()
+{
+	local -i rc="$1"
+	local script="${0##*/}"
+
+	# Ignore if no problems
+	[ "${rc}" -eq "0" ] && return 0
+
+	# Broken
+	shift
+	echo "${script}: $@" >&2
+	return "${rc}"
+}
+
+#
+# exit_if_bad		Put out error message(s) if $1 has bad RC.
+#
+#	$1	0 (pass) or non-zero (fail).
+#	$2+	Remaining arguments printed only if the $1 is non-zero.
+#
+#               Exits with 1 unless $1 is 0
+#
+function exit_if_bad()
+{
+	warn_if_bad "$@" || exit 1
+	return 0
+}
+
+#
+# check_root_or_exit
+#
+#	Breaks the script if not running as root.
+#
+#	If this returns 1, the invoker MUST abort the script.
+#
+#	Returns 0 if running as root
+#	Returns 1 if not (and breaks the script)
+#
+function check_root_or_exit()
+{
+	[ "${UID}" -eq "0" ]
+	exit_if_bad "$?" "Must be run by UID=0. Actual UID=${UID}."
+	return 0
+}
+
+#
+# check_executes	Check for executable(s)
+#
+#	Returns 0 if true.
+#	Returns 1 if not.
+#
+function check_executes()
+{
+	local cmd
+	local all_ok="yes"
+	for cmd in "$@"
+	do
+		if ! type "${cmd}" &>/dev/null
+		then
+			echo "Command \"${cmd}\" not found." >&2
+			all_ok="no"
+		fi
+	done
+	[ "${all_ok}" = "yes" ]
+}
+
+#
+# check_exec_or_exit	Check for required executables.
+#
+#	Exits (not returns) if commands listed on command line do not exist.
+#
+#	Returns 0 if true.
+#	Exits with 1 if not.
+#
+function check_exec_or_exit()
+{
+	check_executes "$@"
+	exit_if_bad "$?" "Above listed required command(s) not found."
+	return 0
+}
+
+TMP_DIR=""
+
+#
+# internal_setup	Script setup
+#
+#	Returns 0 on success.
+#	Exits (not returns) with 1 on failure.
+#
+function internal_setup()
+{
+	shopt -s extglob
+
+	# Trap exit for internal_cleanup function.
+	trap "internal_cleanup" EXIT
+
+	check_exec_or_exit mktemp rm
+
+	umask 0077
+
+	TMP_DIR="$(mktemp -d "/tmp/${0##*/}.XXXXXXXX" 2>/dev/null)"
+	[ -d "${TMP_DIR}" ]
+	exit_if_bad "$?" "Make temporary directory failed."
+
+	custom_setup
+}
+
+#
+# internal_cleanup	Script cleanup (reached via trap 0)
+#
+#	Destory any temporarily facility created by internal_setup.
+#
+function internal_cleanup()
+{
+	custom_cleanup
+
+	[ -d "${TMP_DIR}" ] && rm -rf "${TMP_DIR}"
+}
+
+#
+# custom_setup
+#
+function custom_setup()
+{
+	check_exec_or_exit awk printf sort
+	check_root_or_exit
+}
+
+#
+# custom_cleanup
+#
+function custom_cleanup()
+{
+	:
+}
+
+#
+# cleanup_n_exec	Do the cleanup, then execute the command
+#
+#	$1+	The command to execute
+#
+function cleanup_n_exec()
+{
+	internal_cleanup
+
+	exec "$@"
+}
+
+internal_setup
+
+# Check operating system
+function check_os()
+{
+	case "${OSTYPE}" in
+	"aix"*)     # AIX
+		echo "aix"
+		;;
+	"darwin"*)  # OS X
+		echo "darwin"
+		;;
+	"linux"*)   # Linux
+		echo "linux"
+		;;
+	*)
+		# Unknown
+		echo "${OSTYPE}"
+		;;
+	esac
+}
+
+# Check instruction set architecture
+function check_arch()
+{
+	case "${HOSTTYPE}" in
+	"powerpc64")
+		echo "ppc64"
+		;;
+	"powerpc64le")
+		echo "ppc64le"
+		;;
+	"mipsel")
+		echo "mips"
+		;;
+	"i"?"86")
+		echo "i386"
+		;;
+	*)
+		echo "${HOSTTYPE}"
+		;;
+	esac
+}
+
+function check_linux_distro()
+{
+	local distro="$(source /etc/os-release >/dev/null 2>&1 &&
+		echo "${ID}")"
+	[[ -z "${distro}" ]] && [[ -f /etc/redhat-release ]] && distro="rhel"
+	[[ -z "${distro}" ]] && [[ -f /etc/SuSE-release ]] && distro="sles"
+	echo "${distro}"
+}
+
+function check_linux_version()
+{
+	local ver="$(source /etc/os-release >/dev/null 2>&1 &&
+		echo "${VERSION_ID}")"
+	[[ -z "${ver}" ]] && [[ -f /etc/redhat-release ]] &&
+		ver="$(awk '{ print $(NF - 1) }' /etc/redhat-release)"
+	[[ -z "${ver}" ]] && [[ -f /etc/SuSE-release ]] &&
+		ver="$(awk '/VERSION/ { print $NF }' /etc/SuSE-release)"
+	echo "${ver}"
+}
+
+function function_dispatch()
+{
+	local base="$1"
+	local cmd=""
+	local ret=""
+	shift
+	for cmd in $(compgen -A function "${base}_")
+	do
+		"${cmd}" "$@"
+		ret="$?"
+		[[ "${ret}" -ne "255" ]] && break
+	done
+	[[ "${ret}" -ne "255" ]]
+	exit_if_bad "$?" "${base}: unsupported function"
+	return "${ret}"
+}
+
+# $@    package names
+function check_package_version_rpm()
+{
+	! type rpm >/dev/null 2>&1 && return 255
+	local ver=""
+	while read ver
+	do
+		if [[ -z "${ver}" || "${ver}" =~ not\ installed ]]
+		then
+			echo "(not installed)"
+		else
+			echo "${ver}"
+		fi
+	done < <(rpm -q --qf '%{version}-%{release}\n' "$@")
+	return 0
+}
+
+# $@    package names
+function check_package_version_deb()
+{
+	! type dpkg-query >/dev/null 2>&1 && return 255
+	local name=""
+	local ver=""
+	while read name ver
+	do
+		name+=("${name}")
+		ver+=("${ver}")
+	done < <(dpkg-query --show '--showformat=${Package} ${Version}\n' \
+		"$@" 2>/dev/null)
+	local -i i
+	while [[ -n "$1" ]]
+	do
+		for i in "${!name[@]}"
+		do
+			if [[ "$1" = "${name[i]}" ]]
+			then
+				echo "${ver[i]}"
+				unset "name[${i}]" "ver[${i}]"
+				shift && continue 2
+			fi
+		done
+		echo "(not installed)"
+		shift
+	done
+	return 0
+}
+
+function check_package_version()
+{
+	function_dispatch "${FUNCNAME}" "$@"
+}
+
+# $@    package names
+function check_repo_version_yum()
+{
+	! type repoquery >/dev/null 2>&1 && return 255
+	local -a name=()
+	local -a ver=()
+	while read name ver
+	do
+		name+=("${name}")
+		ver+=("${ver}")
+	done < <(repoquery --qf '%{name} %{version}-%{release}' "$@" 2>/dev/null)
+	local -i i
+	while [[ -n "$1" ]]
+	do
+		for i in "${!name[@]}"
+		do
+			if [[ "$1" = "${name[i]}" ]]
+			then
+				echo "${ver[i]}"
+				unset "name[${i}]" "ver[${i}]"
+				shift && continue 2
+			fi
+		done
+		echo "(not found)"
+		shift
+	done
+	return 0
+}
+
+# $@    package names
+function check_repo_version_zypper()
+{
+	! type zypper >/dev/null 2>&1 && return 255
+	local -a name=()
+	local -a ver=()
+	while read name ver
+	do
+		name+=("${name}")
+		ver+=("${ver}")
+	done < <(zypper --no-gpg-checks -n search -s --match-exact "$@" \
+		2>/dev/null | awk -F ' *\\| *' '/ package / { print $2, $4 }')
+	local -i i
+	while [[ -n "$1" ]]
+	do
+		for i in "${!name[@]}"
+		do
+			if [[ "$1" = "${name[i]}" ]]
+			then
+				echo "${ver[i]}"
+				unset "name[${i}]" "ver[${i}]"
+				shift && continue 2
+			fi
+		done
+		echo "(not found)"
+		shift
+	done
+	return 0
+}
+
+# $@    package names
+function check_repo_version_apt()
+{
+	! type apt-cache >/dev/null 2>&1 && return 255
+	local name=""
+	local ver=""
+	while read name ver
+	do
+		if [[ "${name}" =~ ^[a-z] ]]
+		then
+			while [[ -n "$1" ]]
+			do
+				[[ "${name}" = "${1}:" ]] && break
+				echo "(not found)"
+				shift
+			done
+		fi
+		if [[ "${name}" = "Candidate:" ]]
+		then
+			echo "$ver"
+			shift
+		fi
+	done < <(apt-cache policy "$@" 2>/dev/null)
+	while [[ -n "$1" ]]
+	do
+		echo "(not found)"
+		shift
+	done
+	return 0
+}
+
+function check_repo_version()
+{
+	function_dispatch "${FUNCNAME}" "$@"
+}
+
+# $1    repo_id
+function get_package_list_yum()
+{
+	! type repoquery >/dev/null 2>&1 && return 255
+	local repo_id="$1"
+	[[ -z "${repo_id}" ]] && return 1
+	repoquery -qa "--repoid=${repo_id}" --qf "%{name}" 2>/dev/null
+}
+
+# $1    repo_id
+function get_package_list_zypper()
+{
+	! type zypper >/dev/null 2>&1 && return 255
+	local repo_id="$1"
+	[[ -z "${repo_id}" ]] && return 1
+	zypper --no-gpg-checks -n search -r "${repo_id}" 2>/dev/null |
+		awk -F ' *\\| *' '/ package$/ { print $2 }'
+}
+
+# $1    repo_id
+function get_package_list_apt()
+{
+	[[ ! -d /var/lib/apt/lists ]] && return 255
+	local repo_id="$1"
+	[[ -z "${repo_id}" ]] && return 1
+	awk '/^Package: / { print $2 }' \
+		<"/var/lib/apt/lists/"*"_${repo_id}_dists"*"_main_binary-"*"_Packages" \
+		2>/dev/null
+}
+
+# $1    repo_id
+function get_package_list()
+{
+	function_dispatch "${FUNCNAME}" "$@"
+}
+
+function download_file()
+{
+	local url="$1"
+	local local_file="$2"
+	! type wget >/dev/null 2>&1 && return 255
+	wget -q "${url}" -O "${local_file}"
+}
+
+# $1    repo file
+# $2    repo_id
+function add_repo_by_file_yum()
+{
+	! type yum-config-manager >/dev/null 2>&1 && return 255
+	local repo_file="$1"
+	local repo_id="$2"
+	[[ -f "${repo_file}" ]]
+	exit_if_bad "$?" "${repo_file}: no such file"
+	[[ -r "${repo_file}" ]]
+	exit_if_bad "$?" "${repo_file}: permission denied"
+	[[ -n "${repo_id}" ]]
+	exit_if_bad "$?" "empty repo id"
+	[[ "${repo_id}" =~ ^[a-zA-Z][0-9a-zA-Z-]*$ ]]
+	exit_if_bad "$?" "${repo_id} illigal character in repo id"
+	local tmp_repo_file="${TMP_DIR}/${repo_id}.repo"
+	{
+		echo "[${repo_id}]"
+		grep -v '^\[' "${repo_file}"
+	} >"${tmp_repo_file}"
+	remove_repo_yum "${repo_id}"
+	yum-config-manager "--add-repo=${tmp_repo_file}" >/dev/null 2>&1
+}
+
+# $1    repo file
+# $2    repo_id
+function add_repo_by_file_zypper()
+{
+	! type zypper >/dev/null 2>&1 && return 255
+	local repo_file="$1"
+	local repo_id="$2"
+	[[ -f "${repo_file}" ]]
+	exit_if_bad "$?" "${repo_file}: no such file"
+	[[ -r "${repo_file}" ]]
+	exit_if_bad "$?" "${repo_file}: permission denied"
+	[[ -n "${repo_id}" ]]
+	exit_if_bad "$?" "empty repo id"
+	[[ "${repo_id}" =~ ^[a-zA-Z][0-9a-zA-Z-]*$ ]]
+	exit_if_bad "$?" "${repo_id} illigal character in repo id"
+	local tmp_repo_file="${TMP_DIR}/${repo_id}.repo"
+	{
+		echo "[${repo_id}]"
+		grep -v '^\[' "${repo_file}"
+	} >"${tmp_repo_file}"
+	remove_repo_zypper "${repo_id}"
+	zypper addrepo "${tmp_repo_file}" >/dev/null 2>&1
+}
+
+# $1    repo file
+# $2    repo_id
+function add_repo_by_file_apt()
+{
+	[[ -d /etc/apt/sources.list.d/ ]] || return 255
+	local repo_file="$1"
+	local repo_id="$2"
+	[[ -f "${repo_file}" ]]
+	exit_if_bad "$?" "${repo_file}: no such file"
+	[[ -r "${repo_file}" ]]
+	exit_if_bad "$?" "${repo_file}: permission denied"
+	[[ -n "${repo_id}" ]]
+	exit_if_bad "$?" "empty repo id"
+	[[ "${repo_id}" =~ ^[a-zA-Z][0-9a-zA-Z-]*$ ]]
+	exit_if_bad "$?" "${repo_id} illigal character in repo id"
+	cp "${repo_file}" "/etc/apt/sources.list.d/${repo_id}.list"
+}
+
+function add_repo_by_file()
+{
+	function_dispatch "${FUNCNAME}" "$@"
+}
+
+# $1    base url
+# $2    repo_id
+function add_repo_by_url_yum_or_zypper()
+{
+	local base_url="$1"
+	local repo_id="$2"
+	local tmp_repo_file="${TMP_DIR}/tmp_repo_file"
+	while read ; do echo "${REPLY}" ; done >"${tmp_repo_file}" <<-EOF
+	[${repo_id}]
+	name=${repo_id}
+	baseurl=${base_url}
+	enabled=1
+	gpgcheck=0
+	EOF
+	add_repo_by_file "${tmp_repo_file}" "${repo_id}"
+}
+
+# $1    base url
+# $2    repo_id
+function add_repo_by_url_apt()
+{
+	[[ -d /etc/apt/sources.list.d/ ]] || return 255
+	local base_url="$1"
+	local repo_id="$2"
+	local codename="$(source /etc/lsb-release && echo "${DISTRIB_CODENAME}")"
+	[[ -n "${codename}" ]]
+	exit_if_bad "$?" "unknown debian/ubuntu codename"
+	local tmp_repo_file="${TMP_DIR}/tmp_repo_file"
+	echo "deb ${base_url} ${codename} main" >"${tmp_repo_file}"
+	add_repo_by_file_apt "${tmp_repo_file}" "${repo_id}"
+}
+
+function add_repo_by_url()
+{
+	function_dispatch "${FUNCNAME}" "$@"
+}
+
+# $1    repo_id
+function remove_repo_yum()
+{
+	[[ -d "/etc/yum.repos.d" ]] || return 255
+	local repo_id="$1"
+	[[ -f "/etc/yum.repos.d/${repo_id}.repo" ]] &&
+		rm -f "/etc/yum.repos.d/${repo_id}.repo" &&
+		yum clean metadata >/dev/null 2>&1
+}
+
+function remove_repo_zypper()
+{
+	! type zypper >/dev/null 2>&1 && return 255
+	local repo_id="$1"
+	zypper removerepo "${repo_id}"
+}
+
+function remove_repo_apt()
+{
+	[[ -d "/etc/apt/sources.list.d" ]] || return 255
+	local repo_id="$1"
+	rm -f "/etc/apt/sources.list.d/${repo_id}.list"
+}
+
+function remove_repo()
+{
+	function_dispatch "${FUNCNAME}" "$@"
+}
+
+# $1    version
+#       can be "2.10", "2.11", "2.12" or "latest"
+function add_xcat_core_repo_yum_or_zypper()
+{
+	! type rpm >/dev/null 2>&1 && return 255
+	local ver="$1"
+	[[ -z "${ver}" ]] && ver="latest"
+	local online_repo_file="http://xcat.org/files/xcat/repos/yum/${ver}/xcat-core/xCAT-core.repo"
+	local tmp_repo_file="${TMP_DIR}/tmp_repo_file"
+	download_file "${online_repo_file}" "${tmp_repo_file}"
+	exit_if_bad "$?" "download xcat-core repo file failed"
+	add_repo_by_file "${tmp_repo_file}" "xcat-core"
+}
+
+# $1    version
+#       can be "2.10", "2.11", "2.12" or "latest"
+function add_xcat_core_repo_apt()
+{
+	[[ -d "/etc/apt/sources.list.d" ]] || return 255
+	local ver="$1"
+	[[ -z "${ver}" ]] && ver="latest"
+	local apt_key_url="http://xcat.org/files/xcat/repos/apt/apt.key" 
+	local apt_key_file="${TMP_DIR}/xcat.key"
+	download_file "${apt_key_url}" "${apt_key_file}"
+	exit_if_bad "$?" "download xcat apt key failed"
+	apt-key add "${apt_key_file}" >/dev/null 2>&1
+	local online_repo_base_url="http://xcat.org/files/xcat/repos/apt/${ver}/xcat-core"
+	add_repo_by_url_apt "${online_repo_base_url}" "xcat-core"
+}
+
+function add_xcat_core_repo()
+{
+	function_dispatch "${FUNCNAME}" "$@"
+}
+
+function remove_xcat_core_repo_yum()
+{
+	rm -f /etc/yum.repos.d/xCAT-core.repo
+}
+
+function add_xcat_dep_repo_yum_or_zypper()
+{
+	! type rpm >/dev/null 2>&1 && return 255
+	local distro="${GO_XCAT_LINUX_DISTRO}"
+	case "${distro}" in
+	"fedora") ;;
+	"rhel") distro="rh" ;;
+	"sles") ;;
+	*) exit_if_bad 1 "${distro}: unsupported Linux distro"
+	esac
+	local online_repo_file="http://xcat.org/files/xcat/repos/yum/xcat-dep/${distro}${GO_XCAT_LINUX_VERSION%%.*}/${GO_XCAT_ARCH}/xCAT-dep.repo"
+	local tmp_repo_file="${TMP_DIR}/tmp_repo_file"
+	download_file "${online_repo_file}" "${tmp_repo_file}"
+	exit_if_bad "$?" "download xcat-dep repo file failed"
+	add_repo_by_file "${tmp_repo_file}" "xcat-dep"
+}
+
+function add_xcat_dep_repo_apt()
+{
+	! type dpkg >/dev/null 2>&1 && return 255
+	local online_repo_base_url="http://xcat.org/files/xcat/repos/apt/xcat-dep"
+	add_repo_by_url_apt "${online_repo_base_url}" "xcat-dep"
+}
+
+function add_xcat_dep_repo()
+{
+	function_dispatch "${FUNCNAME}" "$@"
+}
+
+function update_repo_yum()
+{
+	! type yum >/dev/null 2>&1 && return 255
+	yum --nogpgcheck updateinfo </dev/null >/dev/null 2>&1
+}
+
+function update_repo_zypper()
+{
+	! type zypper >/dev/null 2>&1 && return 255
+	zypper --gpg-auto-import-keys refresh </dev/null >/dev/null 2>&1
+}
+
+function update_repo_apt()
+{
+	! type apt-get >/dev/null 2>&1 && return 255
+	apt-get update </dev/null >/dev/null 2>&1
+}
+
+function update_repo()
+{
+	function_dispatch "${FUNCNAME}" "$@"
+}
+
+function install_xcat_yum()
+{
+	! type yum >/dev/null 2>&1 && return 255
+	local -a yes=()
+	[[ "$1" = "-y" ]] && yes=("-y")
+	yum --nogpgcheck "${yes[@]}" install xCAT
+}
+
+function install_xcat_zypper()
+{
+	! type zypper >/dev/null 2>&1 && return 255
+	local -a yes=()
+	[[ "$1" = "-y" ]] && yes=("-n")
+	zypper --no-gpg-checks "${yes[@]}" install xCAT
+}
+
+function install_xcat_apt()
+{
+	! type apt-get >/dev/null 2>&1 && return 255
+	local -a yes=()
+	[[ "$1" = "-y" ]] && yes=("-y")
+	apt-get install "${yes[@]}" xcat
+}
+
+function install_xcat()
+{
+	function_dispatch "${FUNCNAME}" "$@"
+}
+
+GO_XCAT_CORE_PACKAGE_LIST=(perl-xCAT xCAT xCAT-SoftLayer xCAT-buildkit
+	xCAT-client xCAT-confluent xCAT-genesis-scripts-ppc64
+	xCAT-genesis-scripts-x86_64 xCAT-server xCAT-test xCAT-vlan xCATsn)
+# For Debian/Ubuntu, it need a different package list
+type dpkg >/dev/null 2>&1 &&
+GO_XCAT_CORE_PACKAGE_LIST=(perl-xcat xcat xcat-buildkit xcat-client
+	xcat-confluent xcat-genesis-scripts xcat-server xcat-test xcat-vlan
+	xcatsn)
+
+GO_XCAT_DEP_PACKAGE_LIST=()
+
+function list_packages()
+{
+	GO_XCAT_CORE_PACKAGE_LIST=($(
+	for p in "${GO_XCAT_CORE_PACKAGE_LIST[@]}" \
+		$(get_package_list xcat-core)
+	do
+		echo "${p}"
+	done | sort -u
+	))
+	GO_XCAT_DEP_PACKAGE_LIST=($(get_package_list xcat-dep))
+
+	local -i columns="$(type tput >/dev/null 2>&1 && tput cols)"
+	[[ "${columns}" -lt 80 ]] && columns=80
+	[[ "${columns}" -gt 90 ]] && columns=90
+	local -a format=(27 25 25)
+	format[1]=$(( ( columns - 30 ) / 2 ))
+	format[2]="${format[1]}"
+	local pkg=""
+
+	exec 42< <(check_package_version "${GO_XCAT_CORE_PACKAGE_LIST[@]}")
+	exec 43< <(check_repo_version "${GO_XCAT_CORE_PACKAGE_LIST[@]}")
+
+	echo
+	echo "xCAT Core Packages"
+	echo "=================="
+	echo
+
+	printf "%-${format[0]}s %-${format[1]}s %-${format[2]}s\n" \
+		"Package Name" "Installed" "In Repository"
+	printf "%-${format[0]}s %-${format[1]}s %-${format[2]}s\n" \
+		"------------" "---------" "-------------"
+	for pkg in "${GO_XCAT_CORE_PACKAGE_LIST[@]}"
+	do
+		read -u 42 i_ver
+		read -u 43 r_ver
+		printf "%-${format[0]}s %-${format[1]}s %-${format[2]}s\n" \
+			"${pkg:0:${format[0]}}" \
+			"${i_ver:0:${format[1]}}" \
+			"${r_ver:0:${format[2]}}"
+	done
+
+	exec 42<&-
+	exec 43<&-
+
+	exec 42< <(check_package_version "${GO_XCAT_DEP_PACKAGE_LIST[@]}")
+	exec 43< <(check_repo_version "${GO_XCAT_DEP_PACKAGE_LIST[@]}")
+
+	echo
+	echo "xCAT Dependency Packages"
+	echo "========================"
+	echo
+
+	printf "%-${format[0]}s %-${format[1]}s %-${format[2]}s\n" \
+		"Package Name" "Installed" "In Repository"
+	printf "%-${format[0]}s %-${format[1]}s %-${format[2]}s\n" \
+		"------------" "---------" "-------------"
+
+	for pkg in "${GO_XCAT_DEP_PACKAGE_LIST[@]}"
+	do
+		read -u 42 i_ver
+		read -u 43 r_ver
+		printf "%-${format[0]}s %-${format[1]}s %-${format[2]}s\n" \
+			"${pkg:0:${format[0]}}" \
+			"${i_ver:0:${format[1]}}" \
+			"${r_ver:0:${format[2]}}"
+	done
+
+	exec 42<&-
+	exec 43<&-
+}
+
+GO_XCAT_METERS=""
+
+function show_progress_meters()
+{
+	! tty -s 2>/dev/null && return 0
+	# Show the progress meters
+	(
+		declare -i length=0
+
+		while :
+		do
+			for bar in \
+				"...... " \
+				".o..o. " \
+				"oOooOo " \
+				"OoUUoO " \
+				"ooUUoo " \
+				"oOooOo " \
+				"Oo..oO " \
+				"o....o "
+				#12345678901234567890123456789012345678901
+			do
+
+				msg="${bar}"
+				for (( i = 0; i < length; ++i ))
+				do
+					echo -ne "\b"
+				done
+				length=${#msg}
+				echo -n "${msg}"
+
+				sleep 0.1 2>/dev/null || sleep 1
+				kill -0 "$$" &>/dev/null || break 2
+			done
+		done
+	) >&2 &
+	GO_XCAT_METERS="$!"
+	disown "${GO_XCAT_METERS}"
+}
+
+function stop_progress_meters()
+{
+	! tty -s 2>/dev/null && echo -n "...... " && return 0
+	kill "${GO_XCAT_METERS}" >/dev/null 2>&1
+	echo -ne "\b\b\b\b\b\b " >&2
+	echo -ne "...... "
+}
+
+declare -a GO_XCAT_YES=()
+GO_XCAT_ACTION=""
+GO_XCAT_VERSION="latest"
+
+while [ "$#" -gt "0" ]
+do
+	case "$1" in
+	"--help")
+		usage
+		exit 0
+		;;
+	"--install")
+		GO_XCAT_ACTION="install"
+		;;
+	"--xcat-version="*)
+		GO_XCAT_VERSION="${1##--xcat-version=}"
+		;;
+	"-y"|"--yes")
+		GO_XCAT_YES=("-y")
+		;;
+	*)
+		[ "$1" == "--" ] && shift
+		;;
+	esac
+	shift
+done
+
+GO_XCAT_OS="$(check_os)"
+GO_XCAT_ARCH="$(check_arch)"
+
+while read ; do echo "${REPLY}" ; done <<EOF
+Operating system:   ${GO_XCAT_OS}
+Architecture:       ${GO_XCAT_ARCH}
+EOF
+
+case "${GO_XCAT_OS}" in
+"linux")
+	;;
+*)
+	exit_if_bad 1 "${GO_XCAT_OS}: unsupported operating system"
+	;;
+esac
+
+case "${GO_XCAT_ARCH}" in
+"ppc64"|"ppc64le"|"x86_64")
+	;;
+*)
+	exit_if_bad 1 "${GO_XCAT_ARCH}: unsupported instruction set architecture"
+	;;
+esac
+
+GO_XCAT_LINUX_DISTRO="$(check_linux_distro)"
+GO_XCAT_LINUX_VERSION="$(check_linux_version)"
+
+while read ; do echo "${REPLY}" ; done <<EOF
+Linux Distribution: ${GO_XCAT_LINUX_DISTRO}
+Version:            ${GO_XCAT_LINUX_VERSION}
+EOF
+
+case "${GO_XCAT_LINUX_DISTRO}" in
+"rhel"|"sles"|"ubuntu")
+	;;
+*)
+	warn_if_bad 1 "${GO_XCAT_LINUX_DISTRO}: unsupported Linux distro"
+	;;
+esac
+
+echo
+echo -n "Reading repositories "
+show_progress_meters
+ERR_MSG="$({
+	add_xcat_core_repo "${GO_XCAT_VERSION}"
+	add_xcat_dep_repo
+	update_repo
+	RET="$?"
+	if [[ "${RET}" -ne "0" ]]
+	then
+		remove_repo "xcat-core"
+		remove_repo "xcat-dep"
+	fi
+	exit "${RET}"
+} 2>&1)"
+RET="$?"
+stop_progress_meters
+if [[ "${RET}" -ne 0 ]]
+then
+	echo "failed"
+	echo "${ERR_MSG}" >&2
+	exit "${RET}"
+fi
+echo "done"
+
+case "${GO_XCAT_ACTION}" in
+"install")
+	install_xcat "${GO_XCAT_YES[@]}"
+	;;
+*)
+	list_packages
+	;;
+esac
+
+exit 0

From 47d3c0581e239bd7c593ada3f1ca75da381e654f Mon Sep 17 00:00:00 2001
From: GONG Jie <gongjie@linux.vnet.ibm.com>
Date: Thu, 16 Jun 2016 23:15:01 +0800
Subject: [PATCH 2/5] [go-xcat] Add massive logs for debugging

---
 xCAT-server/share/xcat/tools/go-xcat | 307 +++++++++++++++++++++------
 1 file changed, 240 insertions(+), 67 deletions(-)

diff --git a/xCAT-server/share/xcat/tools/go-xcat b/xCAT-server/share/xcat/tools/go-xcat
index 69077f5cf..a02c5117e 100755
--- a/xCAT-server/share/xcat/tools/go-xcat
+++ b/xCAT-server/share/xcat/tools/go-xcat
@@ -1,11 +1,15 @@
 #!/bin/bash
+#
+# go-xcat - Install xCAT automatically.
+#
 
 function usage()
 {
 	local script="${0##*/}"
 
 	while read ; do echo "${REPLY}" ; done <<-EOF
-	Usage: ${script} [--install]
+	Usage: ${script} [OPTION]...
+	Install xCAT automatically
 
 	Options:
 	  --help                        display this help and exit
@@ -15,7 +19,6 @@ function usage()
 	  -y, --yes                     answer yes for all questions
 
 	Examples:
-
 	  ${script}
 	  ${script} --install
 	  ${script} --install --yes
@@ -23,6 +26,29 @@ function usage()
 	EOF
 }
 
+# The package list of xcat-core
+GO_XCAT_CORE_PACKAGE_LIST=(perl-xCAT xCAT xCAT-SoftLayer xCAT-buildkit
+	xCAT-client xCAT-confluent xCAT-genesis-scripts-ppc64
+	xCAT-genesis-scripts-x86_64 xCAT-server xCAT-test xCAT-vlan xCATsn)
+# For Debian/Ubuntu, it will need a sight different package list
+type dpkg >/dev/null 2>&1 &&
+GO_XCAT_CORE_PACKAGE_LIST=(perl-xcat xcat xcat-buildkit xcat-client
+	xcat-confluent xcat-genesis-scripts xcat-server xcat-test xcat-vlan
+	xcatsn)
+GO_XCAT_DEP_PACKAGE_LIST=()
+
+# The package list of all the packages should be installed
+GO_XCAT_CORE_INSTALL_LIST=(perl-xCAT xCAT xCAT-buildkit xCAT-client
+	xCAT-genesis-scripts-ppc64 xCAT-genesis-scripts-x86_64 xCAT-server
+	conserver-xcat elilo-xcat grub2-xcat ipmitool-xcat syslinux-xcat
+	xCAT-genesis-base-ppc64 xCAT-genesis-base-x86_64 xnba-undi yaboot-xcat)
+# For Debian/Ubuntu, it will need a sight different package list
+type dpkg >/dev/null 2>&1 &&
+GO_XCAT_CORE_INSTALL_LIST=(perl-xcat xcat xcat-buildkit xcat-client
+	xcat-genesis-scripts xcat-server
+	conserver-xcat elilo-xcat grub2-xcat ipmitool-xcat syslinux-xcat
+	xcat-genesis-base-amd64 xcat-genesis-base-ppc64 xnba-undi)
+
 PATH="/usr/sbin:/usr/bin:/sbin:/bin"
 export PATH
 
@@ -158,7 +184,7 @@ function internal_cleanup()
 #
 function custom_setup()
 {
-	check_exec_or_exit awk printf sort
+	check_exec_or_exit awk cat printf sort sleep tee
 	check_root_or_exit
 }
 
@@ -683,47 +709,41 @@ function update_repo()
 	function_dispatch "${FUNCNAME}" "$@"
 }
 
-function install_xcat_yum()
+function install_packages_yum()
 {
 	! type yum >/dev/null 2>&1 && return 255
 	local -a yes=()
-	[[ "$1" = "-y" ]] && yes=("-y")
-	yum --nogpgcheck "${yes[@]}" install xCAT
+	[[ "$1" = "-y" ]] && yes=("-y") && shift
+	yum --nogpgcheck "${yes[@]}" install "$@"
 }
 
-function install_xcat_zypper()
+function install_packages_zypper()
 {
 	! type zypper >/dev/null 2>&1 && return 255
 	local -a yes=()
-	[[ "$1" = "-y" ]] && yes=("-n")
-	zypper --no-gpg-checks "${yes[@]}" install xCAT
+	[[ "$1" = "-y" ]] && yes=("-n") && shift
+	zypper --no-gpg-checks "${yes[@]}" install "$@"
 }
 
-function install_xcat_apt()
+function install_packages_apt()
 {
 	! type apt-get >/dev/null 2>&1 && return 255
 	local -a yes=()
-	[[ "$1" = "-y" ]] && yes=("-y")
-	apt-get install "${yes[@]}" xcat
+	[[ "$1" = "-y" ]] && yes=("-y") && shift
+	apt-get install "${yes[@]}" "$@"
 }
 
-function install_xcat()
+function install_packages()
 {
 	function_dispatch "${FUNCNAME}" "$@"
 }
 
-GO_XCAT_CORE_PACKAGE_LIST=(perl-xCAT xCAT xCAT-SoftLayer xCAT-buildkit
-	xCAT-client xCAT-confluent xCAT-genesis-scripts-ppc64
-	xCAT-genesis-scripts-x86_64 xCAT-server xCAT-test xCAT-vlan xCATsn)
-# For Debian/Ubuntu, it need a different package list
-type dpkg >/dev/null 2>&1 &&
-GO_XCAT_CORE_PACKAGE_LIST=(perl-xcat xcat xcat-buildkit xcat-client
-	xcat-confluent xcat-genesis-scripts xcat-server xcat-test xcat-vlan
-	xcatsn)
+function install_xcat()
+{
+	install_packages "$@" "${GO_XCAT_CORE_INSTALL_LIST[@]}"
+}
 
-GO_XCAT_DEP_PACKAGE_LIST=()
-
-function list_packages()
+function list_xcat_packages()
 {
 	GO_XCAT_CORE_PACKAGE_LIST=($(
 	for p in "${GO_XCAT_CORE_PACKAGE_LIST[@]}" \
@@ -734,64 +754,117 @@ function list_packages()
 	))
 	GO_XCAT_DEP_PACKAGE_LIST=($(get_package_list xcat-dep))
 
-	local -i columns="$(type tput >/dev/null 2>&1 && tput cols)"
-	[[ "${columns}" -lt 80 ]] && columns=80
-	[[ "${columns}" -gt 90 ]] && columns=90
-	local -a format=(27 25 25)
-	format[1]=$(( ( columns - 30 ) / 2 ))
-	format[2]="${format[1]}"
+	local -i cols="$(type tput >/dev/null 2>&1 && tput cols)"
+	[[ "${cols}" -lt 80 ]] && cols=80
+	[[ "${cols}" -gt 90 ]] && cols=90
+	local -i first_col=27
+	local -i second_col=$(( ( cols - 30 ) / 2 ))
+	local -i third_col=${second_col}
 	local pkg=""
 
-	exec 42< <(check_package_version "${GO_XCAT_CORE_PACKAGE_LIST[@]}")
-	exec 43< <(check_repo_version "${GO_XCAT_CORE_PACKAGE_LIST[@]}")
-
 	echo
 	echo "xCAT Core Packages"
 	echo "=================="
 	echo
 
-	printf "%-${format[0]}s %-${format[1]}s %-${format[2]}s\n" \
+	printf "%-${first_col}s %-${second_col}s %-${third_col}s\n" \
 		"Package Name" "Installed" "In Repository"
-	printf "%-${format[0]}s %-${format[1]}s %-${format[2]}s\n" \
+	printf "%-${first_col}s %-${second_col}s %-${third_col}s\n" \
 		"------------" "---------" "-------------"
 	for pkg in "${GO_XCAT_CORE_PACKAGE_LIST[@]}"
 	do
-		read -u 42 i_ver
-		read -u 43 r_ver
-		printf "%-${format[0]}s %-${format[1]}s %-${format[2]}s\n" \
-			"${pkg:0:${format[0]}}" \
-			"${i_ver:0:${format[1]}}" \
-			"${r_ver:0:${format[2]}}"
-	done
-
-	exec 42<&-
-	exec 43<&-
-
-	exec 42< <(check_package_version "${GO_XCAT_DEP_PACKAGE_LIST[@]}")
-	exec 43< <(check_repo_version "${GO_XCAT_DEP_PACKAGE_LIST[@]}")
+		read i_ver && read -u 42 r_ver
+		printf "%-${first_col}s %-${second_col}s %-${third_col}s\n" \
+			"${pkg:0:${first_col}}" \
+			"${i_ver:0:${second_col}}" \
+			"${r_ver:0:${third_col}}"
+	done < <(check_package_version "${GO_XCAT_CORE_PACKAGE_LIST[@]}") \
+		42< <(check_repo_version "${GO_XCAT_CORE_PACKAGE_LIST[@]}")
 
 	echo
 	echo "xCAT Dependency Packages"
 	echo "========================"
 	echo
 
-	printf "%-${format[0]}s %-${format[1]}s %-${format[2]}s\n" \
+	printf "%-${first_col}s %-${second_col}s %-${third_col}s\n" \
 		"Package Name" "Installed" "In Repository"
-	printf "%-${format[0]}s %-${format[1]}s %-${format[2]}s\n" \
+	printf "%-${first_col}s %-${second_col}s %-${third_col}s\n" \
 		"------------" "---------" "-------------"
 
 	for pkg in "${GO_XCAT_DEP_PACKAGE_LIST[@]}"
 	do
-		read -u 42 i_ver
-		read -u 43 r_ver
-		printf "%-${format[0]}s %-${format[1]}s %-${format[2]}s\n" \
-			"${pkg:0:${format[0]}}" \
-			"${i_ver:0:${format[1]}}" \
-			"${r_ver:0:${format[2]}}"
-	done
+		read i_ver
+		read -u 42 r_ver
+		printf "%-${first_col}s %-${second_col}s %-${third_col}s\n" \
+			"${pkg:0:${first_col}}" \
+			"${i_ver:0:${second_col}}" \
+			"${r_ver:0:${third_col}}"
+	done < <(check_package_version "${GO_XCAT_DEP_PACKAGE_LIST[@]}") \
+		42< <(check_repo_version "${GO_XCAT_DEP_PACKAGE_LIST[@]}")
+}
 
-	exec 42<&-
-	exec 43<&-
+# Test case 001
+# Check if xcatd is running
+function test_case_001_xcatd()
+{
+	local pid_file=""
+	local pid=""
+	local -i ret=0
+	for pid_file in /var/run/xcat/{installservice.pid,mainservice.pid,udpservice.pid}
+	do
+		[[ -f "${pid_file}" ]]
+		warn_if_bad "$?" "${pid_file} not found"
+		[[ "$?" -ne 0 ]] && (( ++ret ))
+		pid="$(<"${pid_file}")"
+		kill -0 "${pid}"
+		warn_if_bad "$?" "process ${pid} is not running"
+		[[ "$?" -ne 0 ]] && (( ++ret ))
+	done
+	for pid_file in /var/run/xcat/cmdlogservice.pid
+	do
+		[[ -f "${pid_file}" ]] || continue
+		pid="$(<"${pid_file}")"
+		kill -0 "${pid}"
+		warn_if_bad "$?" "process ${pid} is not running"
+		[[ "$?" -ne 0 ]] && (( ++ret ))
+	done
+	return "${ret}"
+}
+
+# Test case 002
+# Check if command lsdef can be run
+function test_case_002_lsdef()
+{
+	(source /etc/profile.d/xcat.sh && lsdef)
+}
+
+# Preform basic test
+function perform_smoke_test()
+{
+	local test_case=""
+	local -i ret=0
+	for test_case in $(compgen -A function "test_case_")
+	do
+		"${test_case}" >"${TMP_DIR}/${test_case}.stdout" \
+			2>"${TMP_DIR}/${test_case}.stderr"
+		ret="$?"
+		if [[ "${ret}" -ne "0" || -s "${TMP_DIR}/${test_case}.stderr" ]]
+		then
+			# Something went wrong
+			echo "-- 8< -- -- -- -- -- -- -- -- -- -- -- -- -- -- --"
+			echo "==== ${test_case} failed with exit code ${ret} ===="
+			echo "-- 8< ${test_case} stdout -- --"
+			while read ; do echo "${REPLY}" ; done \
+				<"${TMP_DIR}/${test_case}.stdout"
+			echo "-- 8< ${test_case} stderr -- --"
+			while read ; do echo "${REPLY}" ; done \
+				<"${TMP_DIR}/${test_case}.stderr"
+			echo "-- 8< -- -- -- -- -- -- -- -- -- -- -- -- -- -- --"
+			(( ++ret ))
+		fi >&2
+	done
+	[[ "${ret}" -eq "0" ]] && echo "It seems everything went well. :)"
+	return "${ret}"
 }
 
 GO_XCAT_METERS=""
@@ -802,7 +875,6 @@ function show_progress_meters()
 	# Show the progress meters
 	(
 		declare -i length=0
-
 		while :
 		do
 			for bar in \
@@ -816,7 +888,6 @@ function show_progress_meters()
 				"o....o "
 				#12345678901234567890123456789012345678901
 			do
-
 				msg="${bar}"
 				for (( i = 0; i < length; ++i ))
 				do
@@ -838,10 +909,15 @@ function stop_progress_meters()
 {
 	! tty -s 2>/dev/null && echo -n "...... " && return 0
 	kill "${GO_XCAT_METERS}" >/dev/null 2>&1
-	echo -ne "\b\b\b\b\b\b " >&2
-	echo -ne "...... "
+	echo -ne "\b\b\b\b\b\b\b" >&2
+	echo -n "...... "
 }
 
+#
+# |\/| _.o._   ._ .__  _ .__.._ _    _  _  _  _  |_  _ .__
+# |  |(_||| |  |_)|(_)(_||(_|| | |  (_|(_)(/__>  | |(/_|(/_ o
+#              |       _|            _|
+
 declare -a GO_XCAT_YES=()
 GO_XCAT_ACTION=""
 GO_XCAT_VERSION="latest"
@@ -849,6 +925,10 @@ GO_XCAT_VERSION="latest"
 while [ "$#" -gt "0" ]
 do
 	case "$1" in
+	"--smoke-test")
+		perform_smoke_test
+		exit "$?"
+		;;
 	"--help")
 		usage
 		exit 0
@@ -872,7 +952,8 @@ done
 GO_XCAT_OS="$(check_os)"
 GO_XCAT_ARCH="$(check_arch)"
 
-while read ; do echo "${REPLY}" ; done <<EOF
+while read ; do echo "${REPLY}" ; echo "${REPLY}" >&2
+	done 2>"${TMP_DIR}/go-xcat.log.000" <<EOF
 Operating system:   ${GO_XCAT_OS}
 Architecture:       ${GO_XCAT_ARCH}
 EOF
@@ -896,7 +977,8 @@ esac
 GO_XCAT_LINUX_DISTRO="$(check_linux_distro)"
 GO_XCAT_LINUX_VERSION="$(check_linux_version)"
 
-while read ; do echo "${REPLY}" ; done <<EOF
+while read ; do echo "${REPLY}" ; echo "${REPLY}" >&2
+	done 2>"${TMP_DIR}/go-xcat.log.001" <<EOF
 Linux Distribution: ${GO_XCAT_LINUX_DISTRO}
 Version:            ${GO_XCAT_LINUX_VERSION}
 EOF
@@ -936,10 +1018,101 @@ echo "done"
 
 case "${GO_XCAT_ACTION}" in
 "install")
-	install_xcat "${GO_XCAT_YES[@]}"
+	if [[ "${#GO_XCAT_YES[@]}" -eq "0" ]]
+	then
+		echo
+		echo "xCAT is going to be installed."
+		read -p "Continue? [y/n] "
+		case "${REPLY}" in
+		"Y"*|"y"*)
+			;;
+		*)
+			echo "Aborting ..."
+			exit 0
+		esac
+	fi
+	(
+		install_xcat -y 2>&1 1>&42 |
+			tee "${TMP_DIR}/install_xcat.stderr" >&2
+		exit "${PIPESTATUS[0]}"
+	) 42>&1 | tee "${TMP_DIR}/install_xcat.stdout"
+	RET="${PIPESTATUS[0]}"
+	{
+		# Creating logs
+		echo "-- 8< -- -- -- -- -- -- -- -- -- -- -- -- -- -- --"
+		echo "==== install_xcat exited with exit code ${RET} ===="
+		echo "-- 8< install_xcat stdout -- --"
+		while read ; do echo "${REPLY}" ; done \
+			<"${TMP_DIR}/install_xcat.stdout"
+		echo "-- 8< install_xcat stderr -- --"
+		while read ; do echo "${REPLY}" ; done \
+			<"${TMP_DIR}/install_xcat.stderr"
+		echo "-- 8< -- -- -- -- -- -- -- -- -- -- -- -- -- -- --"
+	} >"${TMP_DIR}/go-xcat.log.005"
+	if [[ "${RET}" -eq "0" && ! -s "${TMP_DIR}/install_xcat.stderr" ]]
+	then
+		# xCAT has been installed and so far so good
+		perform_smoke_test >"${TMP_DIR}/perform_smoke_test.stdout" \
+			2>"${TMP_DIR}/perform_smoke_test.stderr"
+		RET="$?"
+		if [[ "${RET}" -ne "0" || -s "${TMP_DIR}/perform_smoke_test.stderr" ]]
+		then
+			# Smoke test failed
+			echo "-- 8< -- -- -- -- vv -- -- -- vv -- -- -- -- 8< --"
+			echo "==== perform_smoke_test failed with exit code ${RET} ===="
+			echo "-- 8< perform_smoke_test stdout -- --"
+			while read ; do echo "${REPLY}" ; done \
+				<"${TMP_DIR}/perform_smoke_test.stdout"
+			echo "-- 8< perform_smoke_test stderr -- --"
+			while read ; do echo "${REPLY}" ; done \
+				<"${TMP_DIR}/perform_smoke_test.stderr"
+			echo "-- 8< -- -- -- -- ^^ -- -- -- ^^ -- -- -- -- 8< --"
+		fi
+	fi >"${TMP_DIR}/go-xcat.log.008"
+
+	list_xcat_packages | tee "${TMP_DIR}/go-xcat.log.099"
+
+	if [[ "${RET}" -ne "0" ]]
+	then
+		GO_XCAT_LOG="/tmp/go-xcat.log"
+		cat "${TMP_DIR}/go-xcat.log."* >"${GO_XCAT_LOG}" 2>/dev/null
+		while read ; do echo "${REPLY}" ; done >&2 <<-EOF
+
+
+		Boo-boo
+		=======
+
+		Something went wrong. :(
+
+		Please check log file \`${GO_XCAT_LOG}' for more details.
+		EOF
+
+		exit "${RET}"
+	fi
+
+	while read ; do echo "${REPLY}" ; done <<-EOF
+
+
+	Congratulations
+	===============
+
+	The fact that you got this far is a strong indication that xCAT bas been
+	installed correctly.
+
+	Please notice if this is the first time you install xCAT. You need to do one
+	of the following.
+
+	1. Log out and then log in again, or
+	2. run the following command to set the environment variables.
+
+	    for sh,
+	        \`source /etc/profile.d/xcat.sh\`
+	    or csh,
+	        \`source /etc/profile.d/xcat.csh\`
+	EOF
 	;;
 *)
-	list_packages
+	list_xcat_packages
 	;;
 esac
 

From 771a7a4a2498afd0f5ec174af09d1f9bb3c8774b Mon Sep 17 00:00:00 2001
From: GONG Jie <gongjie@linux.vnet.ibm.com>
Date: Fri, 17 Jun 2016 16:25:18 +0800
Subject: [PATCH 3/5] [go-xcat] Some minor changes, according to comments on
 Gitgub.

---
 xCAT-server/share/xcat/tools/go-xcat | 155 +++++++++++++--------------
 1 file changed, 76 insertions(+), 79 deletions(-)

diff --git a/xCAT-server/share/xcat/tools/go-xcat b/xCAT-server/share/xcat/tools/go-xcat
index a02c5117e..c8206a91d 100755
--- a/xCAT-server/share/xcat/tools/go-xcat
+++ b/xCAT-server/share/xcat/tools/go-xcat
@@ -8,21 +8,22 @@ function usage()
 	local script="${0##*/}"
 
 	while read ; do echo "${REPLY}" ; done <<-EOF
-	Usage: ${script} [OPTION]...
+	Usage: ${script} [OPTION]... [ACTION]
 	Install xCAT automatically
 
 	Options:
 	  --help                        display this help and exit
-	  --install                     installs all the latest versions from the
-	                                repository
 	  --xcat-version=[VERSION]      specify the version of xCAT
 	  -y, --yes                     answer yes for all questions
 
+	Actions:
+	  install                       installs all the latest versions from the
+	                                repository
 	Examples:
 	  ${script}
-	  ${script} --install
-	  ${script} --install --yes
-	  ${script} --install --xcat-version=2.12 --yes
+	  ${script} install
+	  ${script} --yes install
+	  ${script} --xcat-version=2.12 --yes install
 	EOF
 }
 
@@ -256,8 +257,8 @@ function check_linux_distro()
 {
 	local distro="$(source /etc/os-release >/dev/null 2>&1 &&
 		echo "${ID}")"
-	[[ -z "${distro}" ]] && [[ -f /etc/redhat-release ]] && distro="rhel"
-	[[ -z "${distro}" ]] && [[ -f /etc/SuSE-release ]] && distro="sles"
+	[[ -z "${distro}" && -f /etc/redhat-release ]] && distro="rhel"
+	[[ -z "${distro}" && -f /etc/SuSE-release ]] && distro="sles"
 	echo "${distro}"
 }
 
@@ -265,9 +266,9 @@ function check_linux_version()
 {
 	local ver="$(source /etc/os-release >/dev/null 2>&1 &&
 		echo "${VERSION_ID}")"
-	[[ -z "${ver}" ]] && [[ -f /etc/redhat-release ]] &&
+	[[ -z "${ver}" && -f /etc/redhat-release ]] &&
 		ver="$(awk '{ print $(NF - 1) }' /etc/redhat-release)"
-	[[ -z "${ver}" ]] && [[ -f /etc/SuSE-release ]] &&
+	[[ -z "${ver}" && -f /etc/SuSE-release ]] &&
 		ver="$(awk '/VERSION/ { print $NF }' /etc/SuSE-release)"
 	echo "${ver}"
 }
@@ -292,7 +293,7 @@ function function_dispatch()
 # $@    package names
 function check_package_version_rpm()
 {
-	! type rpm >/dev/null 2>&1 && return 255
+	type rpm >/dev/null 2>&1 || return 255
 	local ver=""
 	while read ver
 	do
@@ -302,14 +303,14 @@ function check_package_version_rpm()
 		else
 			echo "${ver}"
 		fi
-	done < <(rpm -q --qf '%{version}-%{release}\n' "$@")
+	done < <(rpm -q --qf '%{version}-%{release}\n' "$@" 2>/dev/null)
 	return 0
 }
 
 # $@    package names
 function check_package_version_deb()
 {
-	! type dpkg-query >/dev/null 2>&1 && return 255
+	type dpkg-query >/dev/null 2>&1 || return 255
 	local name=""
 	local ver=""
 	while read name ver
@@ -344,7 +345,7 @@ function check_package_version()
 # $@    package names
 function check_repo_version_yum()
 {
-	! type repoquery >/dev/null 2>&1 && return 255
+	type repoquery >/dev/null 2>&1 || return 255
 	local -a name=()
 	local -a ver=()
 	while read name ver
@@ -373,7 +374,7 @@ function check_repo_version_yum()
 # $@    package names
 function check_repo_version_zypper()
 {
-	! type zypper >/dev/null 2>&1 && return 255
+	type zypper >/dev/null 2>&1 || return 255
 	local -a name=()
 	local -a ver=()
 	while read name ver
@@ -403,7 +404,7 @@ function check_repo_version_zypper()
 # $@    package names
 function check_repo_version_apt()
 {
-	! type apt-cache >/dev/null 2>&1 && return 255
+	type apt-cache >/dev/null 2>&1 || return 255
 	local name=""
 	local ver=""
 	while read name ver
@@ -439,7 +440,7 @@ function check_repo_version()
 # $1    repo_id
 function get_package_list_yum()
 {
-	! type repoquery >/dev/null 2>&1 && return 255
+	type repoquery >/dev/null 2>&1 || return 255
 	local repo_id="$1"
 	[[ -z "${repo_id}" ]] && return 1
 	repoquery -qa "--repoid=${repo_id}" --qf "%{name}" 2>/dev/null
@@ -448,7 +449,7 @@ function get_package_list_yum()
 # $1    repo_id
 function get_package_list_zypper()
 {
-	! type zypper >/dev/null 2>&1 && return 255
+	type zypper >/dev/null 2>&1 || return 255
 	local repo_id="$1"
 	[[ -z "${repo_id}" ]] && return 1
 	zypper --no-gpg-checks -n search -r "${repo_id}" 2>/dev/null |
@@ -458,7 +459,7 @@ function get_package_list_zypper()
 # $1    repo_id
 function get_package_list_apt()
 {
-	[[ ! -d /var/lib/apt/lists ]] && return 255
+	[[ -d /var/lib/apt/lists ]] || return 255
 	local repo_id="$1"
 	[[ -z "${repo_id}" ]] && return 1
 	awk '/^Package: / { print $2 }' \
@@ -474,9 +475,9 @@ function get_package_list()
 
 function download_file()
 {
+	type wget >/dev/null 2>&1 || return 255
 	local url="$1"
 	local local_file="$2"
-	! type wget >/dev/null 2>&1 && return 255
 	wget -q "${url}" -O "${local_file}"
 }
 
@@ -484,7 +485,7 @@ function download_file()
 # $2    repo_id
 function add_repo_by_file_yum()
 {
-	! type yum-config-manager >/dev/null 2>&1 && return 255
+	type yum-config-manager >/dev/null 2>&1 || return 255
 	local repo_file="$1"
 	local repo_id="$2"
 	[[ -f "${repo_file}" ]]
@@ -508,7 +509,7 @@ function add_repo_by_file_yum()
 # $2    repo_id
 function add_repo_by_file_zypper()
 {
-	! type zypper >/dev/null 2>&1 && return 255
+	type zypper >/dev/null 2>&1 || return 255
 	local repo_file="$1"
 	local repo_id="$2"
 	[[ -f "${repo_file}" ]]
@@ -575,7 +576,8 @@ function add_repo_by_url_apt()
 	[[ -d /etc/apt/sources.list.d/ ]] || return 255
 	local base_url="$1"
 	local repo_id="$2"
-	local codename="$(source /etc/lsb-release && echo "${DISTRIB_CODENAME}")"
+	local codename="$(source /etc/lsb-release >/dev/null 2>&1 &&
+		echo "${DISTRIB_CODENAME}")"
 	[[ -n "${codename}" ]]
 	exit_if_bad "$?" "unknown debian/ubuntu codename"
 	local tmp_repo_file="${TMP_DIR}/tmp_repo_file"
@@ -600,7 +602,7 @@ function remove_repo_yum()
 
 function remove_repo_zypper()
 {
-	! type zypper >/dev/null 2>&1 && return 255
+	type zypper >/dev/null 2>&1 || return 255
 	local repo_id="$1"
 	zypper removerepo "${repo_id}"
 }
@@ -621,7 +623,8 @@ function remove_repo()
 #       can be "2.10", "2.11", "2.12" or "latest"
 function add_xcat_core_repo_yum_or_zypper()
 {
-	! type rpm >/dev/null 2>&1 && return 255
+	type yum-config-manager >/dev/null 2>&1 ||
+		type zypper >/dev/null 2>&1 || return 255
 	local ver="$1"
 	[[ -z "${ver}" ]] && ver="latest"
 	local online_repo_file="http://xcat.org/files/xcat/repos/yum/${ver}/xcat-core/xCAT-core.repo"
@@ -652,14 +655,10 @@ function add_xcat_core_repo()
 	function_dispatch "${FUNCNAME}" "$@"
 }
 
-function remove_xcat_core_repo_yum()
-{
-	rm -f /etc/yum.repos.d/xCAT-core.repo
-}
-
 function add_xcat_dep_repo_yum_or_zypper()
 {
-	! type rpm >/dev/null 2>&1 && return 255
+	type yum-config-manager >/dev/null 2>&1 ||
+		type zypper >/dev/null 2>&1 || return 255
 	local distro="${GO_XCAT_LINUX_DISTRO}"
 	case "${distro}" in
 	"fedora") ;;
@@ -676,7 +675,7 @@ function add_xcat_dep_repo_yum_or_zypper()
 
 function add_xcat_dep_repo_apt()
 {
-	! type dpkg >/dev/null 2>&1 && return 255
+	[[ -d "/etc/apt/sources.list.d" ]] || return 255
 	local online_repo_base_url="http://xcat.org/files/xcat/repos/apt/xcat-dep"
 	add_repo_by_url_apt "${online_repo_base_url}" "xcat-dep"
 }
@@ -688,19 +687,19 @@ function add_xcat_dep_repo()
 
 function update_repo_yum()
 {
-	! type yum >/dev/null 2>&1 && return 255
+	type yum >/dev/null 2>&1 || return 255
 	yum --nogpgcheck updateinfo </dev/null >/dev/null 2>&1
 }
 
 function update_repo_zypper()
 {
-	! type zypper >/dev/null 2>&1 && return 255
+	type zypper >/dev/null 2>&1 || return 255
 	zypper --gpg-auto-import-keys refresh </dev/null >/dev/null 2>&1
 }
 
 function update_repo_apt()
 {
-	! type apt-get >/dev/null 2>&1 && return 255
+	type apt-get >/dev/null 2>&1 || return 255
 	apt-get update </dev/null >/dev/null 2>&1
 }
 
@@ -711,26 +710,26 @@ function update_repo()
 
 function install_packages_yum()
 {
-	! type yum >/dev/null 2>&1 && return 255
-	local -a yes=()
-	[[ "$1" = "-y" ]] && yes=("-y") && shift
-	yum --nogpgcheck "${yes[@]}" install "$@"
+	type yum >/dev/null 2>&1 || return 255
+	local -a args=()
+	[[ "$1" = "-y" ]] && args=("-y") && shift
+	yum --nogpgcheck "${args[@]}" install "$@"
 }
 
 function install_packages_zypper()
 {
-	! type zypper >/dev/null 2>&1 && return 255
-	local -a yes=()
-	[[ "$1" = "-y" ]] && yes=("-n") && shift
-	zypper --no-gpg-checks "${yes[@]}" install "$@"
+	type zypper >/dev/null 2>&1 || return 255
+	local -a args=()
+	[[ "$1" = "-y" ]] && args=("-n") && shift
+	zypper --no-gpg-checks "${args[@]}" install "$@"
 }
 
 function install_packages_apt()
 {
-	! type apt-get >/dev/null 2>&1 && return 255
-	local -a yes=()
-	[[ "$1" = "-y" ]] && yes=("-y") && shift
-	apt-get install "${yes[@]}" "$@"
+	type apt-get >/dev/null 2>&1 || return 255
+	local -a args=()
+	[[ "$1" = "-y" ]] && args=("-y") && shift
+	apt-get install "${args[@]}" "$@"
 }
 
 function install_packages()
@@ -757,6 +756,7 @@ function list_xcat_packages()
 	local -i cols="$(type tput >/dev/null 2>&1 && tput cols)"
 	[[ "${cols}" -lt 80 ]] && cols=80
 	[[ "${cols}" -gt 90 ]] && cols=90
+	[[ -t 1 ]] || cols=90
 	local -i first_col=27
 	local -i second_col=$(( ( cols - 30 ) / 2 ))
 	local -i third_col=${second_col}
@@ -807,26 +807,18 @@ function list_xcat_packages()
 # Check if xcatd is running
 function test_case_001_xcatd()
 {
-	local pid_file=""
-	local pid=""
+	local f=""
 	local -i ret=0
-	for pid_file in /var/run/xcat/{installservice.pid,mainservice.pid,udpservice.pid}
+	for f in /var/run/xcat/{main,install,udp}service.pid
 	do
-		[[ -f "${pid_file}" ]]
-		warn_if_bad "$?" "${pid_file} not found"
-		[[ "$?" -ne 0 ]] && (( ++ret ))
-		pid="$(<"${pid_file}")"
-		kill -0 "${pid}"
-		warn_if_bad "$?" "process ${pid} is not running"
-		[[ "$?" -ne 0 ]] && (( ++ret ))
+		kill -0 "$(<"${f}")"
+		(( ret += $? ))
 	done
-	for pid_file in /var/run/xcat/cmdlogservice.pid
+	for f in /var/run/xcat/cmdlogservice.pid
 	do
-		[[ -f "${pid_file}" ]] || continue
-		pid="$(<"${pid_file}")"
-		kill -0 "${pid}"
-		warn_if_bad "$?" "process ${pid} is not running"
-		[[ "$?" -ne 0 ]] && (( ++ret ))
+		[[ -f "${f}" ]] || continue
+		kill -0 "$(<"${f}")"
+		(( ret += $? ))
 	done
 	return "${ret}"
 }
@@ -860,18 +852,19 @@ function perform_smoke_test()
 			while read ; do echo "${REPLY}" ; done \
 				<"${TMP_DIR}/${test_case}.stderr"
 			echo "-- 8< -- -- -- -- -- -- -- -- -- -- -- -- -- -- --"
-			(( ++ret ))
+			# skip all the remain test cases
+			return "${ret}"
 		fi >&2
 	done
-	[[ "${ret}" -eq "0" ]] && echo "It seems everything went well. :)"
-	return "${ret}"
+	echo "It seems everything went well. :)"
+	return 0
 }
 
 GO_XCAT_METERS=""
 
 function show_progress_meters()
 {
-	! tty -s 2>/dev/null && return 0
+	[[ -t 2 ]] || return 0
 	# Show the progress meters
 	(
 		declare -i length=0
@@ -897,7 +890,7 @@ function show_progress_meters()
 				echo -n "${msg}"
 
 				sleep 0.1 2>/dev/null || sleep 1
-				kill -0 "$$" &>/dev/null || break 2
+				kill -0 "$$" >/dev/null 2>&1 || break 2
 			done
 		done
 	) >&2 &
@@ -907,9 +900,11 @@ function show_progress_meters()
 
 function stop_progress_meters()
 {
-	! tty -s 2>/dev/null && echo -n "...... " && return 0
-	kill "${GO_XCAT_METERS}" >/dev/null 2>&1
-	echo -ne "\b\b\b\b\b\b\b" >&2
+	if [[ -t 2 ]]
+	then
+		kill "${GO_XCAT_METERS}" >/dev/null 2>&1
+		echo -ne "\b\b\b\b\b\b\b" >&2
+	fi
 	echo -n "...... "
 }
 
@@ -925,17 +920,10 @@ GO_XCAT_VERSION="latest"
 while [ "$#" -gt "0" ]
 do
 	case "$1" in
-	"--smoke-test")
-		perform_smoke_test
-		exit "$?"
-		;;
 	"--help")
 		usage
 		exit 0
 		;;
-	"--install")
-		GO_XCAT_ACTION="install"
-		;;
 	"--xcat-version="*)
 		GO_XCAT_VERSION="${1##--xcat-version=}"
 		;;
@@ -944,11 +932,20 @@ do
 		;;
 	*)
 		[ "$1" == "--" ] && shift
+		GO_XCAT_ACTION="$1"
+		shift
 		;;
 	esac
 	shift
 done
 
+case "${GO_XCAT_ACTION}" in
+"smoke-test")
+	perform_smoke_test
+	exit "$?"
+	;;
+esac
+
 GO_XCAT_OS="$(check_os)"
 GO_XCAT_ARCH="$(check_arch)"
 
@@ -1114,6 +1111,6 @@ case "${GO_XCAT_ACTION}" in
 *)
 	list_xcat_packages
 	;;
-esac
+esac # case "${GO_XCAT_ACTION}" in
 
 exit 0

From 6d275ffab67c01e1f960320ff76c7b711f530dd9 Mon Sep 17 00:00:00 2001
From: GONG Jie <gongjie@linux.vnet.ibm.com>
Date: Mon, 20 Jun 2016 00:37:04 +0800
Subject: [PATCH 4/5] [go-xcat] Can use different URL or path for the xcat-core
 and/or xcat-dep repository

---
 xCAT-server/share/xcat/tools/go-xcat | 457 ++++++++++++++++++++++-----
 1 file changed, 380 insertions(+), 77 deletions(-)

diff --git a/xCAT-server/share/xcat/tools/go-xcat b/xCAT-server/share/xcat/tools/go-xcat
index c8206a91d..8dd32d21b 100755
--- a/xCAT-server/share/xcat/tools/go-xcat
+++ b/xCAT-server/share/xcat/tools/go-xcat
@@ -2,6 +2,15 @@
 #
 # go-xcat - Install xCAT automatically.
 #
+# Copyright (C) 2016 International Business Machines
+# Eclipse Public License, Version 1.0 (EPL-1.0)
+#     <http://www.eclipse.org/legal/epl-v10.html>
+#
+# 2016-06-16 GONG Jie <gongjie@linux.vnet.ibm.com>
+#     - created
+# 2016-06-20 GONG Jie <gongjie@linux.vnet.ibm.com>
+#     - released to the field
+#
 
 function usage()
 {
@@ -12,21 +21,57 @@ function usage()
 	Install xCAT automatically
 
 	Options:
-	  --help                        display this help and exit
-	  --xcat-version=[VERSION]      specify the version of xCAT
+	Mandatory arguments to long options are mandatory for short options too.
+	  -h, --help                    display this help and exit
+	  --xcat-core=[URL]             use a different URL or path for the xcat-core
+	                                repository
+	  --xcat-dep=[URL]              use a different URL or path for the xcat-dep
+	                                repository
+	  -x, --xcat-version=[VERSION]  specify the version of xCAT; cannot use with
+	                                --xcat-core
 	  -y, --yes                     answer yes for all questions
 
 	Actions:
-	  install                       installs all the latest versions from the
-	                                repository
+	  install                       installs all the latest versions of xcat-core
+	                                and xcat-dep packages from the repository
+
 	Examples:
 	  ${script}
 	  ${script} install
 	  ${script} --yes install
-	  ${script} --xcat-version=2.12 --yes install
+	  ${script} -x 2.12 -y install
+	  ${script} --xcat-version=devel install
+	  ${script} --xcat-core=/path/to/xcat-core.repo install
+	  ${script} --xcat-core=/path/to/xcat-core install
+	  ${script} --xcat-core=/path/to/xcat-core.tar install
+	  ${script} --xcat-core=/path/to/xcat-core.tar.Z install
+	  ${script} --xcat-core=/path/to/xcat-core.tar.gz install
+	  ${script} --xcat-core=/path/to/xcat-core.tar.bz2 install
+	  ${script} --xcat-core=/path/to/xcat-core.tar.xz install
+	  ${script} --xcat-core=http://xcat.org/path/to/xcat-core.repo install
+	  ${script} --xcat-core=http://xcat.org/path/to/xcat-core install
+	  ${script} --xcat-core=http://xcat.org/path/to/xcat-core.tar.bz2 install
+	  ${script} --xcat-core=/path/to/xcat-core.repo \\\\
+	          --xcat-dep=/path/to/xcat-dep.repo install
+	  ${script} --xcat-core=/path/to/xcat-core \\\\
+	          --xcat-dep=/path/to/xcat-dep install
+	  ${script} --xcat-core=/path/to/xcat-core.tar.bz2 \\\\
+	          --xcat-dep=/path/to/xcat-dep.tar.bz2 install
+	  ${script} --xcat-core=http://xcat.org/path/to/xcat-core.repo \\\\
+	          --xcat-dep=http://xcat.org/path/to/xcat-dep.repo install
+	  ${script} --xcat-core=http://xcat.org/path/to/xcat-core \\\\
+	          --xcat-dep=http://xcat.org/path/to/xcat-dep install
+	  ${script} --xcat-core=http://xcat.org/path/to/xcat-core.tar.bz2 \\\\
+	          --xcat-dep=http://xcat.org/path/to/xcat-dep.tar.bz2 install
+
+	xCAT (Extreme Cloud/Cluster Administration Toolkit): <http://xcat.org/>
+	Full documentation at: <http://xcat-docs.readthedocs.io/en/stable/>
 	EOF
 }
 
+GO_XCAT_DEFAULT_BASE_URL="http://xcat.org/files/xcat/repos"
+GO_XCAT_DEFAULT_INSTALL_PATH="/install/xcat"
+
 # The package list of xcat-core
 GO_XCAT_CORE_PACKAGE_LIST=(perl-xCAT xCAT xCAT-SoftLayer xCAT-buildkit
 	xCAT-client xCAT-confluent xCAT-genesis-scripts-ppc64
@@ -290,7 +335,7 @@ function function_dispatch()
 	return "${ret}"
 }
 
-# $@    package names
+#       $@      package names
 function check_package_version_rpm()
 {
 	type rpm >/dev/null 2>&1 || return 255
@@ -307,7 +352,7 @@ function check_package_version_rpm()
 	return 0
 }
 
-# $@    package names
+#       $@      package names
 function check_package_version_deb()
 {
 	type dpkg-query >/dev/null 2>&1 || return 255
@@ -342,7 +387,7 @@ function check_package_version()
 	function_dispatch "${FUNCNAME}" "$@"
 }
 
-# $@    package names
+#       $@      package names
 function check_repo_version_yum()
 {
 	type repoquery >/dev/null 2>&1 || return 255
@@ -371,7 +416,7 @@ function check_repo_version_yum()
 	return 0
 }
 
-# $@    package names
+#       $@      package names
 function check_repo_version_zypper()
 {
 	type zypper >/dev/null 2>&1 || return 255
@@ -401,7 +446,7 @@ function check_repo_version_zypper()
 	return 0
 }
 
-# $@    package names
+#       $@      package names
 function check_repo_version_apt()
 {
 	type apt-cache >/dev/null 2>&1 || return 255
@@ -437,7 +482,7 @@ function check_repo_version()
 	function_dispatch "${FUNCNAME}" "$@"
 }
 
-# $1    repo_id
+#       $1      repo id
 function get_package_list_yum()
 {
 	type repoquery >/dev/null 2>&1 || return 255
@@ -446,7 +491,7 @@ function get_package_list_yum()
 	repoquery -qa "--repoid=${repo_id}" --qf "%{name}" 2>/dev/null
 }
 
-# $1    repo_id
+#       $1      repo id
 function get_package_list_zypper()
 {
 	type zypper >/dev/null 2>&1 || return 255
@@ -456,7 +501,7 @@ function get_package_list_zypper()
 		awk -F ' *\\| *' '/ package$/ { print $2 }'
 }
 
-# $1    repo_id
+#       $1      repo id
 function get_package_list_apt()
 {
 	[[ -d /var/lib/apt/lists ]] || return 255
@@ -467,7 +512,7 @@ function get_package_list_apt()
 		2>/dev/null
 }
 
-# $1    repo_id
+#       $1      repo id
 function get_package_list()
 {
 	function_dispatch "${FUNCNAME}" "$@"
@@ -481,8 +526,8 @@ function download_file()
 	wget -q "${url}" -O "${local_file}"
 }
 
-# $1    repo file
-# $2    repo_id
+#       $1      repo file
+#       $2      repo id
 function add_repo_by_file_yum()
 {
 	type yum-config-manager >/dev/null 2>&1 || return 255
@@ -495,7 +540,7 @@ function add_repo_by_file_yum()
 	[[ -n "${repo_id}" ]]
 	exit_if_bad "$?" "empty repo id"
 	[[ "${repo_id}" =~ ^[a-zA-Z][0-9a-zA-Z-]*$ ]]
-	exit_if_bad "$?" "${repo_id} illigal character in repo id"
+	exit_if_bad "$?" "${repo_id} illegal character in repo id"
 	local tmp_repo_file="${TMP_DIR}/${repo_id}.repo"
 	{
 		echo "[${repo_id}]"
@@ -505,8 +550,8 @@ function add_repo_by_file_yum()
 	yum-config-manager "--add-repo=${tmp_repo_file}" >/dev/null 2>&1
 }
 
-# $1    repo file
-# $2    repo_id
+#       $1      repo file
+#       $2      repo id
 function add_repo_by_file_zypper()
 {
 	type zypper >/dev/null 2>&1 || return 255
@@ -519,7 +564,7 @@ function add_repo_by_file_zypper()
 	[[ -n "${repo_id}" ]]
 	exit_if_bad "$?" "empty repo id"
 	[[ "${repo_id}" =~ ^[a-zA-Z][0-9a-zA-Z-]*$ ]]
-	exit_if_bad "$?" "${repo_id} illigal character in repo id"
+	exit_if_bad "$?" "${repo_id} illegal character in repo id"
 	local tmp_repo_file="${TMP_DIR}/${repo_id}.repo"
 	{
 		echo "[${repo_id}]"
@@ -529,8 +574,8 @@ function add_repo_by_file_zypper()
 	zypper addrepo "${tmp_repo_file}" >/dev/null 2>&1
 }
 
-# $1    repo file
-# $2    repo_id
+#       $1      repo file
+#       $2      repo id
 function add_repo_by_file_apt()
 {
 	[[ -d /etc/apt/sources.list.d/ ]] || return 255
@@ -543,7 +588,7 @@ function add_repo_by_file_apt()
 	[[ -n "${repo_id}" ]]
 	exit_if_bad "$?" "empty repo id"
 	[[ "${repo_id}" =~ ^[a-zA-Z][0-9a-zA-Z-]*$ ]]
-	exit_if_bad "$?" "${repo_id} illigal character in repo id"
+	exit_if_bad "$?" "${repo_id} illegal character in repo id"
 	cp "${repo_file}" "/etc/apt/sources.list.d/${repo_id}.list"
 }
 
@@ -552,37 +597,202 @@ function add_repo_by_file()
 	function_dispatch "${FUNCNAME}" "$@"
 }
 
-# $1    base url
-# $2    repo_id
-function add_repo_by_url_yum_or_zypper()
+#       $1      archive
+#       $2      repo id
+#       $3      install path
+function extract_archive()
 {
-	local base_url="$1"
+	local archive="$1"
 	local repo_id="$2"
-	local tmp_repo_file="${TMP_DIR}/tmp_repo_file"
-	while read ; do echo "${REPLY}" ; done >"${tmp_repo_file}" <<-EOF
-	[${repo_id}]
-	name=${repo_id}
-	baseurl=${base_url}
-	enabled=1
-	gpgcheck=0
-	EOF
-	add_repo_by_file "${tmp_repo_file}" "${repo_id}"
+	local install_path="$3"
+	[[ -f "${archive}" ]]
+	warn_if_bad "$?" "${archive}: archive file not found!" || return 1
+	mkdir -p "${install_path}" 2>/dev/null
+	warn_if_bad "$?" "create directory \`${install_path}\' failed" ||
+		return 1
+	case "${archive##*.}" in
+	"Z")
+		check_executes uncompress tar grep || return 1
+		uncompress -c "${archive}" | tar -t -f - | grep -v "^${repo_id}/"
+		[[ "${PIPESTATUS[0]}" -eq 0 && "${PIPESTATUS[1]}" -eq 0 &&
+			"${PIPESTATUS[2]}" -eq 1 ]]
+		warn_if_bad "$?" "${archive}: bad compressed tarball" || return 1
+		rm -rf "${install_path}/${repo_id}"
+		uncompress -c "${archive}" | ( cd "${install_path}" && tar -x -f - )
+		;;
+	"tz"|"tgz"|"gz")
+		check_executes gzip tar grep || return 1
+		gzip -d -c "${archive}" | tar -t -f - | grep -v "^${repo_id}/"
+		[[ "${PIPESTATUS[0]}" -eq 0 && "${PIPESTATUS[1]}" -eq 0 &&
+			"${PIPESTATUS[2]}" -eq 1 ]]
+		exit_if_bad "$?" "${archive}: bad gzipped tarball"
+		rm -rf "${install_path}/${repo_id}"
+		gzip -d -c "${archive}" | ( cd "${install_path}" && tar -x -f - )
+		;;
+	"tbz"|"tbz2"|"bz"|"bz2")
+		check_executes bzip2 tar grep || return 1
+		bzip2 -d -c "${archive}" | tar -t -f - | grep -v "^${repo_id}/"
+		[[ "${PIPESTATUS[0]}" -eq 0 && "${PIPESTATUS[1]}" -eq 0 &&
+			"${PIPESTATUS[2]}" -eq 1 ]]
+		warn_if_bad "$?" "${archive}: bad bzipped tarball" || return 1
+		rm -rf "${install_path}/${repo_id}"
+		bzip2 -d -c "${archive}" | ( cd "${install_path}" && tar -x -f - )
+		;;
+	"txz"|"xz")
+		check_executes xz tar grep || return 1
+		xz -d -c "${archive}" | tar -t -f - | grep -v "^${repo_id}/"
+		[[ "${PIPESTATUS[0]}" -eq 0 && "${PIPESTATUS[1]}" -eq 0 &&
+			"${PIPESTATUS[2]}" -eq 1 ]]
+		warn_if_bad "$?" "${archive}: bad xzed tarball" || return 1
+		rm -rf "${install_path}/${repo_id}"
+		xz -d -c "${archive}" | ( cd "${install_path}" && tar -x -f - )
+		;;
+	"tar")
+		check_executes tar grep || return 1
+		tar -t -f "${archive}" | grep -v "^${repo_id}/"
+		[[ "${PIPESTATUS[0]}" -eq 0 && "${PIPESTATUS[1]}" -eq 1 ]]
+		warn_if_bad "$?" "${archive}: bad tarball" || return 1
+		rm -rf "${install_path}/${repo_id}"
+		( cd "${install_path}" && tar -x -f - ) <"${archive}"
+		;;
+	*)
+		warn_if_bad "1" "${archive}: unknown archive file"
+		return 1
+		;;
+	esac
+	[[ -d "${install_path}/${repo_id}" ]]
+	warn_if_bad "$?" "${install_path}/${repo_id}: no such directory"
 }
 
-# $1    base url
-# $2    repo_id
+#       $1      URL
+#       $2      repo id
+function add_repo_by_url_yum_or_zypper()
+{
+	local url="$1"
+	local repo_id="$2"
+	local tmp=""
+	local install_path="${GO_XCAT_DEFAULT_INSTALL_PATH}"
+	case "${url%%://*}" in
+	"ftp"|"http"|"https")
+		case "${url##*.}" in
+		"repo"|"Z"|"bz"|"bz2"|"gz"|"tar"|"tbz"|"tbz2"|"tgz"|"tz"|"txz"|"xz")
+			# an online repo or tarball
+			tmp="${TMP_DIR}/tmp_${url##*/}"
+			download_file "${url}" "${tmp}"
+			warn_if_bad "$?" \
+				"download ${repo_id} resource failed" ||
+				return 1
+			url="${tmp}"
+			;;
+		*) # assume it is the base url of the repo
+			tmp="${TMP_DIR}/tmp_repo.repo"
+			while read ; do echo "${REPLY}" ; done >"${tmp}" <<-EOF
+			[${repo_id}]
+			name=${repo_id}
+			baseurl=${url}
+			enabled=1
+			gpgcheck=0
+			EOF
+			url="${tmp}"
+			;;
+		esac
+		;;
+	"file")
+		url="${url#file://}"
+		;;
+	esac
+	if [[ -f "${url}" ]]
+	then
+		case "${url##*.}" in
+		"repo") # local repo file
+			add_repo_by_file "${url}" "${repo_id}"
+			return "$?"
+			;;
+		esac
+		extract_archive "${url}" "${repo_id}" "${install_path}"
+		warn_if_bad "$?" "extract ${repo_id} archive file failed" ||
+			return 1
+		url="${install_path}/${repo_id}"
+	fi
+	if [[ -d "${url}" ]]
+	then
+		# make sure it is an absolute pathname.
+		[[ "${url:0:1}" = "/" ]] || url="${PWD}/${url}"
+		# directory
+		tmp="${TMP_DIR}/tmp_repo.repo"
+		while read ; do echo "${REPLY}" ; done >"${tmp}" <<-EOF
+		[${repo_id}]
+		name=${repo_id}
+		baseurl=file://${url}
+		enabled=1
+		gpgcheck=0
+		EOF
+		add_repo_by_file "${tmp}" "${repo_id}"
+		return "$?"
+	fi
+	warn_if_bad "1" "invalid ${repo_id} URL"
+}
+
+#       $1      URL
+#       $2      repo id
 function add_repo_by_url_apt()
 {
 	[[ -d /etc/apt/sources.list.d/ ]] || return 255
 	local base_url="$1"
 	local repo_id="$2"
+	local tmp=""
+	local install_path="${GO_XCAT_DEFAULT_INSTALL_PATH}"
 	local codename="$(source /etc/lsb-release >/dev/null 2>&1 &&
 		echo "${DISTRIB_CODENAME}")"
 	[[ -n "${codename}" ]]
-	exit_if_bad "$?" "unknown debian/ubuntu codename"
-	local tmp_repo_file="${TMP_DIR}/tmp_repo_file"
-	echo "deb ${base_url} ${codename} main" >"${tmp_repo_file}"
-	add_repo_by_file_apt "${tmp_repo_file}" "${repo_id}"
+	warn_if_bad "$?" "unknown debian/ubuntu codename" || return 1
+	case "${url%%://*}" in
+	"ftp"|"http"|"https"|"ssh")
+		case "${url##*.}" in
+		"Z"|"bz"|"bz2"|"gz"|"tar"|"tbz"|"tbz2"|"tgz"|"tz"|"txz"|"xz")
+			# an online tarball
+			tmp="${TMP_DIR}/tmp_${url##*/}"
+			download_file "${url}" "${tmp}"
+			warn_if_bad "$?" \
+				"download ${repo_id} resource failed" ||
+				return 1
+			url="${tmp}"
+			;;
+		*) # assume it is the base url of the repo
+			tmp="${TMP_DIR}/tmp_repo.list"
+			echo "deb ${base_url} ${codename} main" >"${tmp}"
+			url="${tmp}"
+			;;
+		esac
+		;;
+	"file")
+		url="${url#file://}"
+		;;
+	esac
+	if [[ -f "${url}" ]]
+	then
+		case "${url##*.}" in
+		"list") # local repo file
+			add_repo_by_file_apt "${url}" "${repo_id}"
+			return "$?"
+			;;
+		esac
+		extract_archive "${url}" "${repo_id}" "${install_path}"
+		warn_if_bad "$?" "extract ${repo_id} archive file failed" ||
+			return 1
+		url="${install_path}/${repo_id}"
+	fi
+	if [[ -d "${url}" ]]
+	then
+		# make sure it is an absolute pathname.
+		[[ "${url:0:1}" = "/" ]] || url="${PWD}/${url}"
+		# directory
+		tmp="${TMP_DIR}/tmp_repo.list"
+		echo "deb file://${url} ${codename} main" >"${tmp}"
+		add_repo_by_file_apt "${tmp}" "${repo_id}"
+		return "$?"
+	fi
+	warn_if_bad "1" "invalid ${repo_id} URL"
 }
 
 function add_repo_by_url()
@@ -590,7 +800,7 @@ function add_repo_by_url()
 	function_dispatch "${FUNCNAME}" "$@"
 }
 
-# $1    repo_id
+#       $1      repo id
 function remove_repo_yum()
 {
 	[[ -d "/etc/yum.repos.d" ]] || return 255
@@ -600,6 +810,7 @@ function remove_repo_yum()
 		yum clean metadata >/dev/null 2>&1
 }
 
+#       $1      repo id
 function remove_repo_zypper()
 {
 	type zypper >/dev/null 2>&1 || return 255
@@ -607,6 +818,7 @@ function remove_repo_zypper()
 	zypper removerepo "${repo_id}"
 }
 
+#       $1      repo id
 function remove_repo_apt()
 {
 	[[ -d "/etc/apt/sources.list.d" ]] || return 255
@@ -619,35 +831,60 @@ function remove_repo()
 	function_dispatch "${FUNCNAME}" "$@"
 }
 
-# $1    version
-#       can be "2.10", "2.11", "2.12" or "latest"
+#       $1      URL
+#       $2      version
+#               can be "2.10", "2.11", "2.12", "latest" or "devel"
 function add_xcat_core_repo_yum_or_zypper()
 {
 	type yum-config-manager >/dev/null 2>&1 ||
 		type zypper >/dev/null 2>&1 || return 255
-	local ver="$1"
+	local url="$1"
+	local ver="$2"
+	local tmp=""
 	[[ -z "${ver}" ]] && ver="latest"
-	local online_repo_file="http://xcat.org/files/xcat/repos/yum/${ver}/xcat-core/xCAT-core.repo"
-	local tmp_repo_file="${TMP_DIR}/tmp_repo_file"
-	download_file "${online_repo_file}" "${tmp_repo_file}"
-	exit_if_bad "$?" "download xcat-core repo file failed"
-	add_repo_by_file "${tmp_repo_file}" "xcat-core"
+	if [[ -z "${url}" ]]
+	then
+		case "${ver}" in
+		"devel")
+			url="${GO_XCAT_DEFAULT_BASE_URL}/yum/devel/core-snap/xCAT-core.repo"
+			;;
+		*)
+			url="${GO_XCAT_DEFAULT_BASE_URL}/yum/${ver}/xcat-core/xCAT-core.repo"
+			;;
+		esac
+	fi
+	add_repo_by_url_yum_or_zypper "${url}" "xcat-core"
 }
 
-# $1    version
-#       can be "2.10", "2.11", "2.12" or "latest"
+#       $1      URL
+#       $2      version
+#               can be "2.10", "2.11", "2.12", "latest" or "devel"
 function add_xcat_core_repo_apt()
 {
 	[[ -d "/etc/apt/sources.list.d" ]] || return 255
-	local ver="$1"
+	local url="$1"
+	local ver="$2"
+	local tmp=""
 	[[ -z "${ver}" ]] && ver="latest"
-	local apt_key_url="http://xcat.org/files/xcat/repos/apt/apt.key" 
-	local apt_key_file="${TMP_DIR}/xcat.key"
-	download_file "${apt_key_url}" "${apt_key_file}"
-	exit_if_bad "$?" "download xcat apt key failed"
-	apt-key add "${apt_key_file}" >/dev/null 2>&1
-	local online_repo_base_url="http://xcat.org/files/xcat/repos/apt/${ver}/xcat-core"
-	add_repo_by_url_apt "${online_repo_base_url}" "xcat-core"
+	if [[ -z "${url}" ]]
+	then
+		# get the apt.key
+		local url="${GO_XCAT_DEFAULT_BASE_URL}/apt/apt.key"
+		local tmp="${TMP_DIR}/tmp_xcat.key"
+		download_file "${url}" "${tmp}"
+		warn_if_bad "$?" "download xcat apt key failed" || return 1
+		apt-key add "${tmp}" >/dev/null 2>&1
+		warn_if_bad "$?" "import xcat apt key failed" || return 1
+		case "${ver}" in
+		"devel")
+			url="${GO_XCAT_DEFAULT_BASE_URL}/apt/devel/core-snap"
+			;;
+		*)
+			url="${GO_XCAT_DEFAULT_BASE_URL}/apt/${ver}/xcat-core"
+			;;
+		esac
+	fi
+	add_repo_by_url_apt "${url}" "xcat-core"
 }
 
 function add_xcat_core_repo()
@@ -659,25 +896,71 @@ function add_xcat_dep_repo_yum_or_zypper()
 {
 	type yum-config-manager >/dev/null 2>&1 ||
 		type zypper >/dev/null 2>&1 || return 255
+	local url="$1"
+	local tmp=""
+	local install_path="${GO_XCAT_DEFAULT_INSTALL_PATH}"
 	local distro="${GO_XCAT_LINUX_DISTRO}"
 	case "${distro}" in
 	"fedora") ;;
 	"rhel") distro="rh" ;;
 	"sles") ;;
-	*) exit_if_bad 1 "${distro}: unsupported Linux distro"
+	*) warn_if_bad 1 "${distro}: unsupported Linux distro" || return 1
 	esac
-	local online_repo_file="http://xcat.org/files/xcat/repos/yum/xcat-dep/${distro}${GO_XCAT_LINUX_VERSION%%.*}/${GO_XCAT_ARCH}/xCAT-dep.repo"
-	local tmp_repo_file="${TMP_DIR}/tmp_repo_file"
-	download_file "${online_repo_file}" "${tmp_repo_file}"
-	exit_if_bad "$?" "download xcat-dep repo file failed"
-	add_repo_by_file "${tmp_repo_file}" "xcat-dep"
+	[[ -z "${url}" ]] &&
+		url="${GO_XCAT_DEFAULT_BASE_URL}/yum/xcat-dep/${distro}${GO_XCAT_LINUX_VERSION%%.*}/${GO_XCAT_ARCH}/xCAT-dep.repo"
+	case "${url##*.}" in
+	"repo") # local repo file
+		add_repo_by_url_yum_or_zypper "${url}" "xcat-dep"
+		return "$?"
+		;;
+	esac
+	case "${url%%://*}" in
+	"ftp"|"http"|"https")
+		case "${url##*.}" in
+		"Z"|"bz"|"bz2"|"gz"|"tar"|"tbz"|"tbz2"|"tgz"|"tz"|"txz"|"xz")
+			# an online archive file
+			tmp="${TMP_DIR}/tmp_${url##*/}"
+			download_file "${url}" "${tmp}"
+			warn_if_bad "$?" "download xcat-dep archive file failed" \
+				|| return 1
+			url="${tmp}"
+			;;
+		*)
+			url="${url}/${distro}${GO_XCAT_LINUX_VERSION%%.*}/${GO_XCAT_ARCH}/xCAT-dep.repo"
+			add_repo_by_url_yum_or_zypper "${url}" "xcat-dep"
+			return "$?"
+			;;
+		esac
+		;;
+	"file")
+		url="${url#file://}"
+		;;
+	esac
+	if [[ -f "${url}" ]]
+	then
+		extract_archive "${url}" "xcat-dep" "${install_path}"
+		warn_if_bad "$?" "extract xcat-dep archive file failed" ||
+			return 1
+		url="${install_path}/xcat-dep"
+	fi
+	if [[ -d "${url}" ]]
+	then
+		# make sure it is an absolute pathname.
+		[[ "${url:0:1}" = "/" ]] || url="${PWD}/${url}"
+		url="${url}/${distro}${GO_XCAT_LINUX_VERSION%%.*}/${GO_XCAT_ARCH}"
+		add_repo_by_url_yum_or_zypper "${url}" "xcat-dep"
+		return "$?"
+	fi
+	warn_if_bad "1" "invalid xcat-dep URL"
 }
 
 function add_xcat_dep_repo_apt()
 {
 	[[ -d "/etc/apt/sources.list.d" ]] || return 255
-	local online_repo_base_url="http://xcat.org/files/xcat/repos/apt/xcat-dep"
-	add_repo_by_url_apt "${online_repo_base_url}" "xcat-dep"
+	local url="$1"
+	[[ -z "${url}" ]] &&
+		url="${GO_XCAT_DEFAULT_BASE_URL}/apt/xcat-dep"
+	add_repo_by_url_apt "${url}" "xcat-dep"
 }
 
 function add_xcat_dep_repo()
@@ -912,21 +1195,35 @@ function stop_progress_meters()
 # |\/| _.o._   ._ .__  _ .__.._ _    _  _  _  _  |_  _ .__
 # |  |(_||| |  |_)|(_)(_||(_|| | |  (_|(_)(/__>  | |(/_|(/_ o
 #              |       _|            _|
+#
+# Main program goes here.
 
 declare -a GO_XCAT_YES=()
 GO_XCAT_ACTION=""
+GO_XCAT_CORE_URL=""
+GO_XCAT_DEP_URL=""
 GO_XCAT_VERSION="latest"
 
 while [ "$#" -gt "0" ]
 do
 	case "$1" in
-	"--help")
+	"-h"|"--help")
 		usage
 		exit 0
 		;;
+	"--xcat-core="*)
+		GO_XCAT_CORE_URL="${1##--xcat-core=}"
+		;;
+	"--xcat-dep="*)
+		GO_XCAT_DEP_URL="${1##--xcat-dep=}"
+		;;
 	"--xcat-version="*)
 		GO_XCAT_VERSION="${1##--xcat-version=}"
 		;;
+	"-x")
+		shift
+		GO_XCAT_VERSION="$1"
+		;;
 	"-y"|"--yes")
 		GO_XCAT_YES=("-y")
 		;;
@@ -992,16 +1289,16 @@ echo
 echo -n "Reading repositories "
 show_progress_meters
 ERR_MSG="$({
-	add_xcat_core_repo "${GO_XCAT_VERSION}"
-	add_xcat_dep_repo
-	update_repo
-	RET="$?"
-	if [[ "${RET}" -ne "0" ]]
+	if add_xcat_core_repo "${GO_XCAT_CORE_URL}" "${GO_XCAT_VERSION}"
 	then
+		if add_xcat_dep_repo "${GO_XCAT_DEP_URL}"
+		then
+			update_repo && exit 0
+			remove_repo "xcat-dep"
+		fi
 		remove_repo "xcat-core"
-		remove_repo "xcat-dep"
 	fi
-	exit "${RET}"
+	exit 1
 } 2>&1)"
 RET="$?"
 stop_progress_meters
@@ -1114,3 +1411,9 @@ case "${GO_XCAT_ACTION}" in
 esac # case "${GO_XCAT_ACTION}" in
 
 exit 0
+
+# vim: set filetype=bash
+# vim: set noautoindent
+# vim: set tabstop=4 shiftwidth=4 softtabstop=4
+
+# End of file

From 2ce5afe57679fa35693599f7db7b3fa01acc39be Mon Sep 17 00:00:00 2001
From: GONG Jie <gongjie@linux.vnet.ibm.com>
Date: Mon, 20 Jun 2016 21:21:17 +0800
Subject: [PATCH 5/5] [go-xcat] Add another small test case to check if all the
 xcat-core packages are on the same version

---
 xCAT-server/share/xcat/tools/go-xcat | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/xCAT-server/share/xcat/tools/go-xcat b/xCAT-server/share/xcat/tools/go-xcat
index 8dd32d21b..648749f80 100755
--- a/xCAT-server/share/xcat/tools/go-xcat
+++ b/xCAT-server/share/xcat/tools/go-xcat
@@ -1086,6 +1086,22 @@ function list_xcat_packages()
 		42< <(check_repo_version "${GO_XCAT_DEP_PACKAGE_LIST[@]}")
 }
 
+# Test case 000
+# Check if all the xcat-core packages are on the same version
+function test_case_000_version()
+{
+	local ver=""
+	local -i ret=0
+	while read
+	do
+		[[ "${REPLY}" = "(not installed)" ]] && continue
+		[[ -z "${ver}" ]] && ver="${REPLY%%-*}"
+		[[ "${ver}" = "${REPLY%%-*}" ]]
+		(( ret += $? ))
+	done < <(check_package_version "${GO_XCAT_CORE_PACKAGE_LIST[@]}")
+	return "${ret}"
+}
+
 # Test case 001
 # Check if xcatd is running
 function test_case_001_xcatd()
@@ -1113,7 +1129,7 @@ function test_case_002_lsdef()
 	(source /etc/profile.d/xcat.sh && lsdef)
 }
 
-# Preform basic test
+# Perform basic smoke test
 function perform_smoke_test()
 {
 	local test_case=""