random-mirrors/dockur-windows
1
0
Fork 0
mirror of https://github.com/dockur/windows.git synced 2026-08-24 07:39:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: Preserve extraction signal exit statuses (#2094)

Browse Source
This commit is contained in:
Kroese
2026-08-07 06:06:52 +02:00
committed by GitHub
parent 6129e500bd
commit ffc9f02c83
1 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/install.sh
+20 -9
View File
@@ -729,14 +729,16 @@ getArchiveSize() {
local -n result="$result_name" local -n result="$result_name"
local listing line value local listing line value
local found=0 local found=0 rc
result=0 result=0
if ! listing=$(7z l -slt "$file" 2>/dev/null); then listing=$(7z l -slt "$file" 2>/dev/null) || {
rc=$?
(( rc >= 129 )) && exit "$rc"
error "Failed to read archive information: $file" error "Failed to read archive information: $file"
return 1 return 1
fi }
while IFS= read -r line; do while IFS= read -r line; do
@@ -768,6 +770,7 @@ extractImage() {
local desc="local ISO" local desc="local ISO"
local archive="${dir}.archive" local archive="${dir}.archive"
local file size required archiveSize local file size required archiveSize
local rc
if [ -z "$CUSTOM" ]; then if [ -z "$CUSTOM" ]; then
desc="downloaded ISO" desc="downloaded ISO"
@@ -777,8 +780,12 @@ extractImage() {
fi fi
if [[ "${iso,,}" == *".esd" ]]; then if [[ "${iso,,}" == *".esd" ]]; then
extractESD "$iso" "$dir" "$version" "$desc" && return 0 extractESD "$iso" "$dir" "$version" "$desc" || {
return 1 rc=$?
(( rc >= 129 )) && exit "$rc"
return 1
}
return 0
fi fi
local msg="Extracting $desc image" local msg="Extracting $desc image"
@@ -822,11 +829,13 @@ extractImage() {
/run/progress.sh "$target" "$size" "$msg ([P])..." & /run/progress.sh "$target" "$size" "$msg ([P])..." &
if ! 7z x "$iso" -o"$target" > /dev/null; then 7z x "$iso" -o"$target" > /dev/null || {
rc=$?
fKill "progress.sh" fKill "progress.sh"
(( rc >= 129 )) && exit "$rc"
error "Failed to extract ISO file: $iso" error "Failed to extract ISO file: $iso"
return 1 return 1
fi }
fKill "progress.sh" fKill "progress.sh"
@@ -869,10 +878,12 @@ extractImage() {
checkFreeSpace "$dir" "$size" || return 1 checkFreeSpace "$dir" "$size" || return 1
if ! 7z x "$iso" -o"$dir" > /dev/null; then 7z x "$iso" -o"$dir" > /dev/null || {
rc=$?
(( rc >= 129 )) && exit "$rc"
error "Failed to extract nested ISO file: $iso" error "Failed to extract nested ISO file: $iso"
return 1 return 1
fi }
LABEL=$(isoinfo -d -i "$iso" | sed -n 's/Volume id: //p') || LABEL="" LABEL=$(isoinfo -d -i "$iso" | sed -n 's/Volume id: //p') || LABEL=""