diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 41983115..ebecbe78 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -24,10 +24,8 @@ jobs: -e SC2001 -e SC2002 -e SC2034 - -e SC2064 -e SC2153 -e SC2317 - -e SC2028 - name: Lint Dockerfile uses: hadolint/hadolint-action@v3.3.0 diff --git a/src/define.sh b/src/define.sh index 5b7699d0..36df2638 100644 --- a/src/define.sh +++ b/src/define.sh @@ -1801,7 +1801,7 @@ prepareInstall() { echo " WaitForReboot=\"No\"" echo " DriverSigningPolicy=\"Ignore\"" echo " NonDriverSigningPolicy=\"Ignore\"" - echo " OemPnPDriversPath=\"Drivers\viostor;Drivers\NetKVM;Drivers\sata\"" + printf '%s\n' " OemPnPDriversPath=\"Drivers\viostor;Drivers\NetKVM;Drivers\sata\"" echo " NoWaitAfterTextMode=1" echo " NoWaitAfterGUIMode=1" echo " FileSystem=ConvertNTFS" @@ -1897,20 +1897,20 @@ prepareInstall() { echo "\"DefaultDomainName\"=\"Dockur\"" fi echo "" - echo "[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Video\{23A77BF7-ED96-40EC-AF06-9B1F4867732A}\0000]" + printf '%s\n' "[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Video\{23A77BF7-ED96-40EC-AF06-9B1F4867732A}\0000]" echo "\"DefaultSettings.BitsPerPel\"=dword:00000020" echo "\"DefaultSettings.XResolution\"=dword:$XHEX" echo "\"DefaultSettings.YResolution\"=dword:$YHEX" echo "" - echo "[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Control\VIDEO\{23A77BF7-ED96-40EC-AF06-9B1F4867732A}\0000]" + printf '%s\n' "[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Control\VIDEO\{23A77BF7-ED96-40EC-AF06-9B1F4867732A}\0000]" echo "\"DefaultSettings.BitsPerPel\"=dword:00000020" echo "\"DefaultSettings.XResolution\"=dword:$XHEX" echo "\"DefaultSettings.YResolution\"=dword:$YHEX" echo "" echo "[HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\RunOnce]" - echo "\"ScreenSaver\"=\"reg add \\\"HKCU\\\\Control Panel\\\\Desktop\\\" /f /v \\\"SCRNSAVE.EXE\\\" /t REG_SZ /d \\\"off\\\"\"" - echo "\"ScreenSaverOff\"=\"reg add \\\"HKCU\\\\Control Panel\\\\Desktop\\\" /f /v \\\"ScreenSaveActive\\\" /t REG_SZ /d \\\"0\\\"\"" - echo "\"SharedDrive\"=\"cmd /C net use Z: \\\\\\\\host.lan\\\\Data /persistent:yes\"" + printf '%s\n' "\"ScreenSaver\"=\"reg add \\\"HKCU\\\\Control Panel\\\\Desktop\\\" /f /v \\\"SCRNSAVE.EXE\\\" /t REG_SZ /d \\\"off\\\"\"" + printf '%s\n' "\"ScreenSaverOff\"=\"reg add \\\"HKCU\\\\Control Panel\\\\Desktop\\\" /f /v \\\"ScreenSaveActive\\\" /t REG_SZ /d \\\"0\\\"\"" + printf '%s\n' "\"SharedDrive\"=\"cmd /C net use Z: \\\\\\\\host.lan\\\\Data /persistent:yes\"" echo "$oem" echo "" } | unix2dos > "$dir/\$OEM\$/install.reg" || return 1 @@ -1976,7 +1976,7 @@ prepareInstall() { echo "" echo "Set oLink = WshShell.CreateShortcut(WshShell.SpecialFolders(\"Desktop\") & \"\\Shared.lnk\")" echo "With oLink" - echo " .TargetPath = \"\\\\host.lan\\Data\"" + printf '%s\n' " .TargetPath = \"\\\\host.lan\\Data\"" echo " .Save" echo "End With" echo "Set oLink = Nothing" diff --git a/src/power.sh b/src/power.sh index d4e6f515..dd1a41fa 100644 --- a/src/power.sh +++ b/src/power.sh @@ -22,6 +22,8 @@ _trap() { TRAP_PID=$BASHPID for sig; do + # Capture the local callback and signal while registering the trap. + # shellcheck disable=SC2064 trap "$func $sig" "$sig" done