luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-27 17:46:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

ci: Fix backslash escaping in run-docker.sh

Browse Source 
Spotted by shellcheck (warning SC1117): `\e` is not an actual escape
sequence, so it’s interpreted as `\\e`. Best make that explicit.

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
This commit is contained in:
Philip Withnall 2020-11-17 14:21:57 +00:00
parent 066e68001e
commit 51651ac67e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.gitlab-ci/run-docker.sh
View File

@ -46,7 +46,7 @@ while (($# > 0)); do
--base|-b) read_arg base "$@" || shift;; --base|-b) read_arg base "$@" || shift;;
--base-version) read_arg base_version "$@" || shift;; --base-version) read_arg base_version "$@" || shift;;
--no-login) no_login=1;; --no-login) no_login=1;;
*) echo -e "\e[1;31mERROR\e[0m: Unknown option '$1'"; exit 1;; *) echo -e "\\e[1;31mERROR\\e[0m: Unknown option '$1'"; exit 1;;
esac esac
shift shift
done done
@ -75,7 +75,7 @@ if [ $list == 1 ]; then
filename=$( basename -- "$f" ) filename=$( basename -- "$f" )
basename="${filename%.*}" basename="${filename%.*}"
echo -e " \e[1;39m$basename\e[0m" echo -e " \\e[1;39m$basename\\e[0m"
done done
exit 0 exit 0
fi fi
@ -87,7 +87,7 @@ if [ -z "${base}" ]; then
fi fi
if [ ! -f "$base.Dockerfile" ]; then if [ ! -f "$base.Dockerfile" ]; then
echo -e "\e[1;31mERROR\e[0m: Dockerfile for '$base' not found" echo -e "\\e[1;31mERROR\\e[0m: Dockerfile for '$base' not found"
exit 1 exit 1
fi fi
@ -100,7 +100,7 @@ fi
TAG="registry.gitlab.gnome.org/gnome/glib/${base}:${base_version}" TAG="registry.gitlab.gnome.org/gnome/glib/${base}:${base_version}"
if [ $build == 1 ]; then if [ $build == 1 ]; then
echo -e "\e[1;32mBUILDING\e[0m: ${base} as ${TAG}" echo -e "\\e[1;32mBUILDING\\e[0m: ${base} as ${TAG}"
$SUDO_CMD docker build \ $SUDO_CMD docker build \
--build-arg HOST_USER_ID="$UID" \ --build-arg HOST_USER_ID="$UID" \
--build-arg COVERITY_SCAN_PROJECT_NAME="${COVERITY_SCAN_PROJECT_NAME}" \ --build-arg COVERITY_SCAN_PROJECT_NAME="${COVERITY_SCAN_PROJECT_NAME}" \
@ -111,7 +111,7 @@ if [ $build == 1 ]; then
fi fi
if [ $push == 1 ]; then if [ $push == 1 ]; then
echo -e "\e[1;32mPUSHING\e[0m: ${base} as ${TAG}" echo -e "\\e[1;32mPUSHING\\e[0m: ${base} as ${TAG}"
if [ $no_login == 0 ]; then if [ $no_login == 0 ]; then
$SUDO_CMD docker login registry.gitlab.gnome.org $SUDO_CMD docker login registry.gitlab.gnome.org
@ -122,7 +122,7 @@ if [ $push == 1 ]; then
fi fi
if [ $run == 1 ]; then if [ $run == 1 ]; then
echo -e "\e[1;32mRUNNING\e[0m: ${base} as ${TAG}" echo -e "\\e[1;32mRUNNING\\e[0m: ${base} as ${TAG}"
$SUDO_CMD docker run \ $SUDO_CMD docker run \
--rm \ --rm \
--volume "$(pwd)/..:/home/user/app" \ --volume "$(pwd)/..:/home/user/app" \