efelon/shell_sequencer
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Fix unbound variable errors

Browse Source
This commit is contained in:
Martin Winkler
2022-06-02 16:08:07 +02:00
parent a6eeccb417
commit 4f8c1b5388
15 changed files with 85 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
seqs/raspberry.sh
View File

@@ -55,10 +55,10 @@ HDSWAPPUUID=
evalArgs() {
local argCount=0
for arg in "$@"; do
for _ in "$@"; do
case "$1" in
-a|--arch)
if [ ! -z "$2" ]; then
if [ -n "${2:-}" ]; then
PIARCH="$2"
((argCount+=2))
else
@@ -115,7 +115,7 @@ step_2_info() {
echoinfoArgs "[OPTIONS] [SD CARD DEVICE]"
echo "Write Raspberry Pi OS image to SD card"
echoinfo "This operation will delete all data previously on the SD card!"
contextExe && [ ! -z $1 ] && echoinfo " [SD CARD DEVICE]: $1"
contextExe && [ -n "${1:-}" ] && echoinfo " [SD CARD DEVICE]: $1"
}
step_2_alias() { echo "writesd"; }
step_2() {
@@ -134,7 +134,7 @@ step_2() {
endReturn -o 1 "No root"
fi
read_sd_dev "$1"
read_sd_dev "${1:-}"
# check if device was confirmed
if [ $? -ne 0 ] ; then
endReturn -o 1 "SD card device not found"
@@ -162,14 +162,14 @@ step_3_info() {
echoinfoArgs "[SD CARD DEVICE]"
echo "Prepare SD for first run"
if contextExe; then
[ ! -z $1 ] && echoinfo " [SD CARD DEVICE]: $1"
[ -n "${1:-}" ] && echoinfo " [SD CARD DEVICE]: $1"
fi
}
step_3() {
# Shift away args
shift; local lArgs=( "$@" ); evalArgs "${lArgs[@]}"; shift $?
if [ -z $1 ] && [ ! -z $SDDEV ] ; then
if [ -z "${1:-}" ] && [ -n "${SDDEV:-}" ] ; then
if quiet ; then
answer="n"
else
@@ -188,7 +188,7 @@ step_3() {
esac
fi
read_sd_dev "$1"
read_sd_dev "${1:-}"
endReturn -o $? "SD card device not found"
if [ ! -w "$SDBOOT" ] ; then
@@ -213,8 +213,8 @@ step_4_info() {
echoinfoArgs "[SD CARD DEVICE] [HD DEVICE]"
echo "Prepare SD card to boot from hard disk"
if contextExe; then
[ ! -z $1 ] && echoinfo " [SD CARD DEVICE]: $1"
[ ! -z $2 ] && echoinfo " [HD DEVICE]: $2"
[ -n "${1:-}" ] && echoinfo " [SD CARD DEVICE]: $1"
[ -n "${2:-}" ] && echoinfo " [HD DEVICE]: $2"
fi
}
step_4_alias() { echo "hdboot"; }
@@ -222,9 +222,9 @@ step_4() {
# Shift away args
shift; local lArgs=( "$@" ); evalArgs "${lArgs[@]}"; shift $?
read_sd_dev "$1"
read_sd_dev "${1:-}"
endReturn -o $? "SD detection error $?"
read_hd_dev "$2"
read_hd_dev "${2:-}"
endReturn -o $? "HD detection error"
echo " [I] SD: $SDDEV"
echo " $SDBOOT [$SDBOOTPUUID]"
@@ -285,8 +285,8 @@ step_5_info() {
echo "Prepare HD for boot (TODO)"
if contextExe; then
[ ! -z $1 ] && echoinfo " [SD CARD DEVICE]: $1"
[ ! -z $2 ] && echoinfo " [HD DEVICE]: $2"
[ -n "${1:-}" ] && echoinfo " [SD CARD DEVICE]: $1"
[ -n "${2:-}" ] && echoinfo " [HD DEVICE]: $2"
fi
}
step_5() {
@@ -296,10 +296,10 @@ step_5() {
#TODO
error -e "Not ready yet...TODO"
#return 1
read_sd_dev "$1"
read_sd_dev "${1:-}"
endReturn -o $? "SD detection error $?"
read_hd_dev "$2"
read_hd_dev "${2:-}"
endReturn -o $? "HD detection error"
echo " [I] SD: $SDDEV"
echo " $SDBOOT [$SDBOOTPUUID]"
@@ -333,14 +333,14 @@ step_5() {
read_sd_dev() {
local partExt=""
if [ ! -z "$1" ] ; then
if [ -n "${1:-}" ] ; then
SDBOOT=
SDROOT=
SDROOTDEV=
SDROOTPUUID=
SDBOOTPUUID=
SDDEV="$1"
elif [ -z $SDDEV ] || [ ! -b "$SDDEV" ] ; then
elif [ -z "${SDDEV:-}" ] || [ ! -b "$SDDEV" ] ; then
SDDEV=
SDBOOT=
SDROOT=
@@ -385,7 +385,7 @@ SDBOOTPARTNO=1
SDROOTPARTNO=2
read_hd_dev() {
if [ ! -z "$1" ] ; then
if [ -n "${1:-}" ] ; then
HDROOT=
HDROOTPUUID=
HDSWAPPUUID=
@@ -447,7 +447,7 @@ step_22_info() { echoinfoArgs "[SD CARD DEVICE]"; echo "Resize second SD card pa
step_22_alias() { echo "resizesd"; }
step_22() {
shift
read_sd_dev "$1"
read_sd_dev "${1:-}"
if [ -z $SDDEV ] || [ "$SDDEV" = "" ] || [ "$SDROOT" == "/" ] ; then
error -e "No SD found"
return 1
@@ -570,7 +570,7 @@ tvserviceOffCmd="${tvserviceBin} -o'"
# checkBootConfig <CONFIGNAME> [VALUE]
checkBootConfig() {
[ -z "$1" ] && return 1
[ -z "${1:-}" ] && return 1
local re_check="^[[:blank:]]*[^#]*${1}[[:blank:]]*=[[:blank:]]*$2"
grep -rqE "$re_check" "$RPI_BOOT_CONFIG"