temporarily disable errexit for kiwi-ng check
This commit is contained in:
parent
2bca3f5354
commit
41e509a0b4
@ -27,7 +27,7 @@ OPTS=$(getopt -a -n cloud-build -o c:,o:,p:,d,h \
|
|||||||
-l cloud-image:,output-dir:,peridot:,debug,help -- "$@")
|
-l cloud-image:,output-dir:,peridot:,debug,help -- "$@")
|
||||||
|
|
||||||
function is_in_path() {
|
function is_in_path() {
|
||||||
builtin type -P "${1}"
|
builtin type -P "${1}" &> /dev/null
|
||||||
}
|
}
|
||||||
|
|
||||||
function usage() {
|
function usage() {
|
||||||
@ -55,13 +55,15 @@ fi
|
|||||||
if [ -e "/sys/fs/selinux/enforce" ]; then
|
if [ -e "/sys/fs/selinux/enforce" ]; then
|
||||||
enforce_check="$(cat /sys/fs/selinux/enforce)"
|
enforce_check="$(cat /sys/fs/selinux/enforce)"
|
||||||
if [ "$enforce_check" -eq "1" ]; then
|
if [ "$enforce_check" -eq "1" ]; then
|
||||||
printf "${YELLOW}WARNING:${NORMAL} Running with selinux enforcing may cause issues with the final image.\n"
|
printf "%sWARNING:%s Running with selinux enforcing may cause issues with the final image.\n" "${YELLOW}" "${NORMAL}"
|
||||||
printf "Proceed at your own risk.\n"
|
printf "Proceed at your own risk.\n"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
is_in_path kiwi-ng &> /dev/null
|
set +e
|
||||||
|
is_in_path kiwi-ng
|
||||||
ret_val=$?
|
ret_val=$?
|
||||||
|
set -e
|
||||||
|
|
||||||
if [ "$ret_val" -ne "0" ]; then
|
if [ "$ret_val" -ne "0" ]; then
|
||||||
echo "kiwi-ng not found. kiwi packages are likely not installed on this system."
|
echo "kiwi-ng not found. kiwi packages are likely not installed on this system."
|
||||||
|
@ -27,7 +27,7 @@ OPTS=$(getopt -a -n container-build -o c:,o:,p:,d,h \
|
|||||||
-l container:,output-dir:,peridot:,debug,help -- "$@")
|
-l container:,output-dir:,peridot:,debug,help -- "$@")
|
||||||
|
|
||||||
function is_in_path() {
|
function is_in_path() {
|
||||||
builtin type -P "${1}"
|
builtin type -P "${1}" &> /dev/null
|
||||||
}
|
}
|
||||||
|
|
||||||
function usage() {
|
function usage() {
|
||||||
@ -55,13 +55,15 @@ fi
|
|||||||
if [ -e "/sys/fs/selinux/enforce" ]; then
|
if [ -e "/sys/fs/selinux/enforce" ]; then
|
||||||
enforce_check="$(cat /sys/fs/selinux/enforce)"
|
enforce_check="$(cat /sys/fs/selinux/enforce)"
|
||||||
if [ "$enforce_check" -eq "1" ]; then
|
if [ "$enforce_check" -eq "1" ]; then
|
||||||
printf "${YELLOW}WARNING:${NORMAL} Running with selinux enforcing may cause issues with the final image.\n"
|
printf "%sWARNING:%s Running with selinux enforcing may cause issues with the final image.\n" "${YELLOW}" "${NORMAL}"
|
||||||
printf "Proceed at your own risk.\n"
|
printf "Proceed at your own risk.\n"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
is_in_path kiwi-ng &> /dev/null
|
set +e
|
||||||
|
is_in_path kiwi-ng
|
||||||
ret_val=$?
|
ret_val=$?
|
||||||
|
set -e
|
||||||
|
|
||||||
if [ "$ret_val" -ne "0" ]; then
|
if [ "$ret_val" -ne "0" ]; then
|
||||||
echo "kiwi-ng not found. kiwi packages are likely not installed on this system."
|
echo "kiwi-ng not found. kiwi packages are likely not installed on this system."
|
||||||
|
@ -28,7 +28,7 @@ OPTS=$(getopt -a -n live-build -o l:,o:,p:,m:,d,h \
|
|||||||
-l live-image:,output-dir:,peridot:,minor:,debug,help -- "$@")
|
-l live-image:,output-dir:,peridot:,minor:,debug,help -- "$@")
|
||||||
|
|
||||||
function is_in_path() {
|
function is_in_path() {
|
||||||
builtin type -P "${1}"
|
builtin type -P "${1}" &> /dev/null
|
||||||
}
|
}
|
||||||
|
|
||||||
function usage() {
|
function usage() {
|
||||||
@ -57,13 +57,15 @@ fi
|
|||||||
if [ -e "/sys/fs/selinux/enforce" ]; then
|
if [ -e "/sys/fs/selinux/enforce" ]; then
|
||||||
enforce_check="$(cat /sys/fs/selinux/enforce)"
|
enforce_check="$(cat /sys/fs/selinux/enforce)"
|
||||||
if [ "$enforce_check" -eq "1" ]; then
|
if [ "$enforce_check" -eq "1" ]; then
|
||||||
printf "${YELLOW}WARNING:${NORMAL} Running with selinux enforcing may cause issues with the final image.\n"
|
printf "%sWARNING:%s Running with selinux enforcing may cause issues with the final image.\n" "${YELLOW}" "${NORMAL}"
|
||||||
printf "Proceed at your own risk.\n"
|
printf "Proceed at your own risk.\n"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
is_in_path kiwi-ng &> /dev/null
|
set +e
|
||||||
|
is_in_path kiwi-ng
|
||||||
ret_val=$?
|
ret_val=$?
|
||||||
|
set -e
|
||||||
|
|
||||||
if [ "$ret_val" -ne "0" ]; then
|
if [ "$ret_val" -ne "0" ]; then
|
||||||
echo "kiwi-ng not found. kiwi packages are likely not installed on this system."
|
echo "kiwi-ng not found. kiwi packages are likely not installed on this system."
|
||||||
|
@ -27,7 +27,7 @@ OPTS=$(getopt -a -n sbc-build -o c:,o:,p:,d,h \
|
|||||||
-l sbc-image:,output-dir:,peridot:,debug,help -- "$@")
|
-l sbc-image:,output-dir:,peridot:,debug,help -- "$@")
|
||||||
|
|
||||||
function is_in_path() {
|
function is_in_path() {
|
||||||
builtin type -P "${1}"
|
builtin type -P "${1}" &> /dev/null
|
||||||
}
|
}
|
||||||
|
|
||||||
function usage() {
|
function usage() {
|
||||||
@ -55,13 +55,15 @@ fi
|
|||||||
if [ -e "/sys/fs/selinux/enforce" ]; then
|
if [ -e "/sys/fs/selinux/enforce" ]; then
|
||||||
enforce_check="$(cat /sys/fs/selinux/enforce)"
|
enforce_check="$(cat /sys/fs/selinux/enforce)"
|
||||||
if [ "$enforce_check" -eq "1" ]; then
|
if [ "$enforce_check" -eq "1" ]; then
|
||||||
printf "${YELLOW}WARNING:${NORMAL} Running with selinux enforcing may cause issues with the final image.\n"
|
printf "%sWARNING:%s Running with selinux enforcing may cause issues with the final image.\n" "${YELLOW}" "${NORMAL}"
|
||||||
printf "Proceed at your own risk.\n"
|
printf "Proceed at your own risk.\n"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
is_in_path kiwi-ng &> /dev/null
|
set +e
|
||||||
|
is_in_path kiwi-ng
|
||||||
ret_val=$?
|
ret_val=$?
|
||||||
|
set -e
|
||||||
|
|
||||||
if [ "$ret_val" -ne "0" ]; then
|
if [ "$ret_val" -ne "0" ]; then
|
||||||
echo "kiwi-ng not found. kiwi packages are likely not installed on this system."
|
echo "kiwi-ng not found. kiwi packages are likely not installed on this system."
|
||||||
|
@ -27,7 +27,7 @@ OPTS=$(getopt -a -n wsl-build -o c:,o:,p:,d,h \
|
|||||||
-l wsl-image:,output-dir:,peridot:,debug,help -- "$@")
|
-l wsl-image:,output-dir:,peridot:,debug,help -- "$@")
|
||||||
|
|
||||||
function is_in_path() {
|
function is_in_path() {
|
||||||
builtin type -P "${1}"
|
builtin type -P "${1}" &> /dev/null
|
||||||
}
|
}
|
||||||
|
|
||||||
function usage() {
|
function usage() {
|
||||||
@ -55,13 +55,15 @@ fi
|
|||||||
if [ -e "/sys/fs/selinux/enforce" ]; then
|
if [ -e "/sys/fs/selinux/enforce" ]; then
|
||||||
enforce_check="$(cat /sys/fs/selinux/enforce)"
|
enforce_check="$(cat /sys/fs/selinux/enforce)"
|
||||||
if [ "$enforce_check" -eq "1" ]; then
|
if [ "$enforce_check" -eq "1" ]; then
|
||||||
printf "${YELLOW}WARNING:${NORMAL} Running with selinux enforcing may cause issues with the final image.\n"
|
printf "%sWARNING:%s Running with selinux enforcing may cause issues with the final image.\n" "${YELLOW}" "${NORMAL}"
|
||||||
printf "Proceed at your own risk.\n"
|
printf "Proceed at your own risk.\n"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
is_in_path kiwi-ng &> /dev/null
|
set +e
|
||||||
|
is_in_path kiwi-ng
|
||||||
ret_val=$?
|
ret_val=$?
|
||||||
|
set -e
|
||||||
|
|
||||||
if [ "$ret_val" -ne "0" ]; then
|
if [ "$ret_val" -ne "0" ]; then
|
||||||
echo "kiwi-ng not found. kiwi packages are likely not installed on this system."
|
echo "kiwi-ng not found. kiwi packages are likely not installed on this system."
|
||||||
|
Loading…
Reference in New Issue
Block a user