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

fix: Stop falling back to manual setup on errors (#2101)

Browse Source
This commit is contained in:
Kroese
2026-08-07 07:48:25 +02:00
committed by GitHub
parent 84eabc07fb
commit 543060fd95
3 changed files with 106 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/answer.sh
+8 -8
View File
@@ -69,7 +69,7 @@ setXML() {
CUSTOM_XML=""
removeGeneratedXML "$target" || return 1
removeGeneratedXML "$target" || return 2
if [ -d "${custom_files[0]}" ]; then
error "The bind ${custom_files[0]} maps to a file that does not exist!"
@@ -98,7 +98,7 @@ setXML() {
if [[ "${DETECTED,,}" == *"-eval" ]] &&
{ [ ! -f "$file" ] || [ ! -s "$file" ]; }; then
generateEvalXML "$DETECTED" "$index" || return 1
generateEvalXML "$DETECTED" "$index" || return $?
file="$target"
elif [ ! -f "$file" ] || [ ! -s "$file" ]; then
@@ -107,7 +107,7 @@ setXML() {
elif [[ "$file" != "$target" ]]; then
generateFallbackXML "$DETECTED" "$index" || return 1
generateFallbackXML "$DETECTED" "$index" || return $?
file="$target"
fi
@@ -340,12 +340,12 @@ generateEvalXML() {
local target="/run/assets/$id.xml"
local source="/run/assets/$normal.xml"
removeGeneratedXML "$source" || return 1
removeGeneratedXML "$source" || return 2
if [ ! -s "$source" ]; then
source="/run/assets/${normal%%-*}.xml"
removeGeneratedXML "$source" || return 1
removeGeneratedXML "$source" || return 2
fi
@@ -361,7 +361,7 @@ generateEvalXML() {
esac
fi
generateAnswerFile "$id" "$source" "$target" "$index" "evaluation" "$remove_selector" || return 1
generateAnswerFile "$id" "$source" "$target" "$index" "evaluation" "$remove_selector" || return 2
return 0
}
@@ -379,11 +379,11 @@ generateFallbackXML() {
[ "$source" != "$target" ] || return 1
removeGeneratedXML "$source" || return 1
removeGeneratedXML "$source" || return 2
[ -s "$source" ] || return 1
generateAnswerFile "$id" "$source" "$target" "$index" "fallback" "Y" || return 1
generateAnswerFile "$id" "$source" "$target" "$index" "fallback" "Y" || return 2
return 0
}