kata-containers/s390-tools
1
0
Fork 0
mirror of https://github.com/ibm-s390-linux/s390-tools.git synced 2026-08-05 02:14:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

scripts/cpictl: Fix ShellCheck warnings

Browse Source 
Fix SC2162, SC2166 and SC2181 reported by ShellCheck without changing
script behavior.

Github-ID: https://github.com/ibm-s390-linux/s390-tools/pull/199
Signed-off-by: Nikita Dubrovskii <nikita@linux.ibm.com>
Reviewed-by: Marc Hartmayer <marc@linux.ibm.com>
Reviewed-by: Hendrik Brueckner <brueckner@linux.ibm.com>
Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
This commit is contained in:
Nikita Dubrovskii
2026-02-05 13:17:43 +01:00
committed by Jan Höppner
parent 5c2e6fd730
commit eb881c2a39
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
scripts/cpictl
View File

@@ -137,7 +137,7 @@ fail_with()
{
echo "$1" >&2
echo "Try '$PRG --help' for more information." >&2
exit ${2:-$EXIT_FAILURE}
exit "${2:-$EXIT_FAILURE}"
}
cpi_commit()
@@ -435,30 +435,33 @@ if [ $# -le 0 ]; then
print_parse_error_and_exit
fi
opts=$(getopt -o b:ehL:N:S:T:v -l set-bit:,environment,help,level:,name:,sysplex:,type:,commit,dry-run,permit-cpi,show,version -n "$PRG" -- "$@")
if [ $? -ne 0 ]; then
if ! opts=$(getopt -o b:ehL:N:S:T:v \
-l set-bit:,environment,help,level:,name:,sysplex:,type:,commit,dry-run,permit-cpi,show,version \
-n "$PRG" -- "$@") ; then
print_parse_error_and_exit
fi
# This guarantees that only one instance will be running, and will serialize
# the execution of multiple instances
[ -e "$CPI_LOCK" -a ! -w "$CPI_LOCK" ] &&
if [[ -e "$CPI_LOCK" && ! -w "$CPI_LOCK" ]] ; then
fail_with "$PRG: Cannot access lock file: $CPI_LOCK"
[ ! -w "${CPI_LOCK%/*}" ] &&
fi
if [[ ! -w "${CPI_LOCK%/*}" ]] ; then
fail_with "$PRG: Cannot access lock file: $CPI_LOCK"
fi
exec 9<> "$CPI_LOCK"
flock -x 9
# Get current values from sys/firmware
read LEVEL < "$SYSTEM_LEVEL_PATH"
read TYPE < "$SYSTEM_TYPE_PATH"
read NAME < "$SYSTEM_NAME_PATH"
read SYSPLEX < "$SYSPLEX_NAME_PATH"
read -r LEVEL < "$SYSTEM_LEVEL_PATH"
read -r TYPE < "$SYSTEM_TYPE_PATH"
read -r NAME < "$SYSTEM_NAME_PATH"
read -r SYSPLEX < "$SYSPLEX_NAME_PATH"
# Parse command line options: Use eval to remove getopt quotes
eval set -- $opts
while [ -n $1 ]; do
eval set -- "$opts"
while [ -n "$1" ]; do
case "$1" in
--help|-h)
print_help_and_exit