From f7074e178af21e567de684d0f9402b82b053d787 Mon Sep 17 00:00:00 2001 From: Jose Carlos Venegas Munoz Date: Wed, 1 Aug 2018 12:23:28 -0500 Subject: [PATCH] obs: : Minor bash fixes (refactor) Remove unused variables and set default value to variables. Signed-off-by: Jose Carlos Venegas Munoz --- obs-packaging/build_all.sh | 4 +++- obs-packaging/build_from_docker.sh | 20 +++++++++---------- obs-packaging/kata-containers-image/update.sh | 1 - obs-packaging/ksm-throttler/update.sh | 1 - obs-packaging/proxy/update.sh | 1 - obs-packaging/qemu-lite/update.sh | 1 - obs-packaging/qemu-vanilla/update.sh | 1 - obs-packaging/runtime/update.sh | 2 -- obs-packaging/scripts/pkglib.sh | 2 +- obs-packaging/shim/update.sh | 1 - 10 files changed, 13 insertions(+), 21 deletions(-) diff --git a/obs-packaging/build_all.sh b/obs-packaging/build_all.sh index 97218e31b8..1dd05b5bea 100755 --- a/obs-packaging/build_all.sh +++ b/obs-packaging/build_all.sh @@ -27,6 +27,8 @@ runtime OSCRC="${HOME}/.oscrc" PUSH=${PUSH:-""} +LOCAL=${LOCAL:-""} +PUSH_TO_OBS="" export BUILD_DISTROS=${BUILD_DISTROS:-xUbuntu_16.04} # Packaging use this variable instead of use git user value @@ -38,7 +40,7 @@ cd "$script_dir" OBS_API="https://api.opensuse.org" -if [ -n "${OBS_USER}" ] && [ -n "${OBS_PASS}" ] && [ ! -e "${OSCRC}" ]; then +if [ -n "${OBS_USER:-}" ] && [ -n "${OBS_PASS:-}" ] && [ ! -e "${OSCRC:-}" ]; then echo "Creating ${OSCRC} with user $OBS_USER" cat << eom > "${OSCRC}" [general] diff --git a/obs-packaging/build_from_docker.sh b/obs-packaging/build_from_docker.sh index 2f35818c49..3b12b98304 100755 --- a/obs-packaging/build_from_docker.sh +++ b/obs-packaging/build_from_docker.sh @@ -19,27 +19,25 @@ packaging_repo_dir=$(cd "${script_dir}/.." && pwd ) host_datadir="${PWD}/pkgs" obs_image="obs-kata" export USE_DOCKER=1 +http_proxy=${http_proxy:-} +https_proxy=${https_proxy:-} +no_proxy=${no_proxy:-} +PUSH=${PUSH:-} -if command -v go; then - export GO_ARCH=$(go env GOARCH) -else - export GO_ARCH=amd64 - echo "Go not installed using $GO_ARCH to install go in dockerfile" -fi -export GO_ARCH=$(go env GOARCH) +GO_ARCH=$(go env GOARCH) +export GO_ARCH sudo docker build \ --build-arg http_proxy="${http_proxy}" \ --build-arg https_proxy="${https_proxy}" \ - -t $obs_image ${script_dir} + -t $obs_image "${script_dir}" pushd "${script_dir}/kata-containers-image/" >> /dev/null + echo "Building image" ./build_image.sh popd >> /dev/null -function faketty { script -qfc "$(printf "%q " "$@")"; } - -faketty sudo docker run \ +sudo docker run \ --rm \ -v "${HOME}/.ssh":/root/.ssh \ -v "${HOME}/.gitconfig":/root/.gitconfig \ diff --git a/obs-packaging/kata-containers-image/update.sh b/obs-packaging/kata-containers-image/update.sh index 2d5478115c..92645615f4 100755 --- a/obs-packaging/kata-containers-image/update.sh +++ b/obs-packaging/kata-containers-image/update.sh @@ -36,7 +36,6 @@ cli "$@" PROJECT_REPO=${PROJECT_REPO:-home:${OBS_PROJECT}:${OBS_SUBPROJECT}/kata-containers-image} RELEASE=$(get_obs_pkg_release "${PROJECT_REPO}") ((RELEASE++)) -[ -n "$APIURL" ] && APIURL="-A ${APIURL}" function check_image() { [ ! -f "${SCRIPT_DIR}/kata-containers.tar.gz" ] && die "No kata-containers.tar.gz found!\nUse the build_image.sh script" || echo "Image: OK" diff --git a/obs-packaging/ksm-throttler/update.sh b/obs-packaging/ksm-throttler/update.sh index 5c7618fef3..ba41532946 100755 --- a/obs-packaging/ksm-throttler/update.sh +++ b/obs-packaging/ksm-throttler/update.sh @@ -36,7 +36,6 @@ cli "$@" PROJECT_REPO=${PROJECT_REPO:-home:${OBS_PROJECT}:${OBS_SUBPROJECT}/ksm-throttler} RELEASE=$(get_obs_pkg_release "${PROJECT_REPO}") ((RELEASE++)) -[ -n "$APIURL" ] && APIURL="-A ${APIURL}" set_versions "$kata_ksm_throttler_hash" diff --git a/obs-packaging/proxy/update.sh b/obs-packaging/proxy/update.sh index 06f35ac083..c9ca68f98a 100755 --- a/obs-packaging/proxy/update.sh +++ b/obs-packaging/proxy/update.sh @@ -32,7 +32,6 @@ cli "$@" PROJECT_REPO=${PROJECT_REPO:-home:${OBS_PROJECT}:${OBS_SUBPROJECT}/proxy} RELEASE=$(get_obs_pkg_release "${PROJECT_REPO}") ((RELEASE++)) -[ -n "$APIURL" ] && APIURL="-A ${APIURL}" set_versions $kata_proxy_hash diff --git a/obs-packaging/qemu-lite/update.sh b/obs-packaging/qemu-lite/update.sh index bbc872e377..50506263aa 100755 --- a/obs-packaging/qemu-lite/update.sh +++ b/obs-packaging/qemu-lite/update.sh @@ -32,7 +32,6 @@ cli "$@" PROJECT_REPO=${PROJECT_REPO:-home:${OBS_PROJECT}:${OBS_SUBPROJECT}/qemu-lite} RELEASE=$(get_obs_pkg_release "${PROJECT_REPO}") ((RELEASE++)) -[ -n "$APIURL" ] && APIURL="-A ${APIURL}" replace_list=( diff --git a/obs-packaging/qemu-vanilla/update.sh b/obs-packaging/qemu-vanilla/update.sh index 603023e65d..c839fe5d82 100755 --- a/obs-packaging/qemu-vanilla/update.sh +++ b/obs-packaging/qemu-vanilla/update.sh @@ -33,7 +33,6 @@ cli "$@" PROJECT_REPO=${PROJECT_REPO:-home:${OBS_PROJECT}:${OBS_SUBPROJECT}/qemu-vanilla} RELEASE=$(get_obs_pkg_release "${PROJECT_REPO}") ((RELEASE++)) -[ -n "$APIURL" ] && APIURL="-A ${APIURL}" replace_list=( "VERSION=$VERSION" diff --git a/obs-packaging/runtime/update.sh b/obs-packaging/runtime/update.sh index f770978e91..23ff449e2d 100755 --- a/obs-packaging/runtime/update.sh +++ b/obs-packaging/runtime/update.sh @@ -78,8 +78,6 @@ PROJECT_REPO=${PROJECT_REPO:-home:${OBS_PROJECT}:${OBS_SUBPROJECT}/runtime} RELEASE=$(get_obs_pkg_release "${PROJECT_REPO}") ((RELEASE++)) -[ -n "$APIURL" ] && APIURL="-A ${APIURL}" - set_versions "$kata_runtime_hash" replace_list=( diff --git a/obs-packaging/scripts/pkglib.sh b/obs-packaging/scripts/pkglib.sh index c21ea42938..e29efe00aa 100644 --- a/obs-packaging/scripts/pkglib.sh +++ b/obs-packaging/scripts/pkglib.sh @@ -313,7 +313,7 @@ function get_obs_pkg_release() { pkg=$(basename "${obs_pkg_name}") repo_dir=$(mktemp -d -u -t "${pkg}.XXXXXXXXXXX") - out=$(osc ${APIURL} -q co "${obs_pkg_name}" -o "${repo_dir}") || die "failed to checkout:$out" + out=$(osc ${APIURL:-} -q co "${obs_pkg_name}" -o "${repo_dir}") || die "failed to checkout:$out" spec_file=$(find "${repo_dir}" -maxdepth 1 -type f -name '*.spec' | head -1) # Find in specfile in Release: XX field. diff --git a/obs-packaging/shim/update.sh b/obs-packaging/shim/update.sh index e28ba4d52b..d950d88f0d 100755 --- a/obs-packaging/shim/update.sh +++ b/obs-packaging/shim/update.sh @@ -33,7 +33,6 @@ cli "$@" PROJECT_REPO=${PROJECT_REPO:-home:${OBS_PROJECT}:${OBS_SUBPROJECT}/shim} RELEASE=$(get_obs_pkg_release "${PROJECT_REPO}") ((RELEASE++)) -[ -n "$APIURL" ] && APIURL="-A ${APIURL}" set_versions $kata_shim_hash replace_list=(