Live-USB durch eigenständige Anwendung ersetzen
Some checks failed
Tests / test (push) Has been cancelled
Some checks failed
Tests / test (push) Has been cancelled
This commit is contained in:
@@ -32,6 +32,7 @@ mkdir -p "$TMP/app" "$(dirname "$OUT")"
|
||||
install -m755 "$GUI" "$TMP/app/intake-gui"
|
||||
install -m755 "$SCANNER" "$TMP/app/pc-intake"
|
||||
install -m644 "$MANIFEST" "$TMP/app/release.json"
|
||||
python3 "$ROOT/scripts/release-manifest.py" --verify-release "$TMP/app"
|
||||
(
|
||||
cd "$TMP/app"
|
||||
sha256sum intake-gui pc-intake release.json > SHA256SUMS
|
||||
@@ -85,10 +86,37 @@ esac
|
||||
|
||||
extract_bundle
|
||||
data_dir=\${XDG_DATA_HOME:-\${HOME:-\$PWD}/.local/share}/csr-intake
|
||||
expect_data=0
|
||||
has_data=0
|
||||
for argument in "\$@"; do
|
||||
[ "\$argument" = '--data' ] && has_data=1
|
||||
if [ "\$expect_data" -eq 1 ]; then
|
||||
data_dir=\$argument
|
||||
expect_data=0
|
||||
elif [ "\$argument" = '--data' ]; then
|
||||
has_data=1
|
||||
expect_data=1
|
||||
fi
|
||||
done
|
||||
[ "\$expect_data" -eq 0 ] || {
|
||||
echo 'Missing directory after --data.' >&2
|
||||
exit 2
|
||||
}
|
||||
|
||||
workshop_config=\$data_dir/config/workshop.json
|
||||
if [ -f "\$workshop_config" ]; then
|
||||
keyboard_layout=\$(python3 - "\$workshop_config" <<'PY' 2>/dev/null || true
|
||||
import json
|
||||
import sys
|
||||
layout = json.load(open(sys.argv[1], encoding='utf-8')).get('keyboard_layout', '')
|
||||
if layout in ('de', 'us'):
|
||||
print(layout)
|
||||
PY
|
||||
)
|
||||
if [ -n "\$keyboard_layout" ]; then
|
||||
export XKB_DEFAULT_LAYOUT=\$keyboard_layout
|
||||
fi
|
||||
fi
|
||||
|
||||
export CSR_SCANNER="\$app_dir/pc-intake"
|
||||
if [ "\$has_data" -eq 1 ]; then
|
||||
exec "\$app_dir/intake-gui" "\$@"
|
||||
|
||||
Reference in New Issue
Block a user