2025.03.25 17:12:56 (desktop)

This commit is contained in:
Christian Moser 2025-03-25 17:12:56 +01:00
parent d8e8b78615
commit 9146286104
Failed to extract signature
2 changed files with 15 additions and 8 deletions

View File

@ -1,6 +1,11 @@
#!/bin/bash #!/bin/bash
# vim: syn=sh ts=4 sts=4 sw=4 smartindent expandtab ff=unix # vim: syn=sh ts=4 sts=4 sw=4 smartindent expandtab ff=unix
: ${INSTALL_PACKAGES:="YES"}
INSTALL_PACKAGES="$( echo "$INSTALL_PACKAGES" | tr '[:lower:]' '[:upper:]' )"
SELF="$( realpath "$0" )" SELF="$( realpath "$0" )"
PROJECT_DIR="$( dirname "$SELF")" PROJECT_DIR="$( dirname "$SELF")"
: ${PYTHON_VENV_DIR:=$(cygpath "$USERPROFILE")/python-venv} : ${PYTHON_VENV_DIR:=$(cygpath "$USERPROFILE")/python-venv}
@ -8,15 +13,17 @@ venv="${PYTHON_VENV_DIR}/sgbackup"
venv_bin="${venv}/bin" venv_bin="${venv}/bin"
wvenv_bin="$(cygpath -w "$venv_bin")" wvenv_bin="$(cygpath -w "$venv_bin")"
PACKAGES="gtk4 gobject-introspection python-pip python-gobject python-rapidfuzz" if [ "$INSTALL_PACKAGES" = "YES" -o "$INSTALL_PACKAGES" = "TRUE" -o "$INSTALL_PACKAGES" = 1 ]; then
PACKAGES="gtk4 gobject-introspection python-pip python-gobject python-rapidfuzz"
_install_pkg="base-devel" _install_pkg="base-devel"
for i in $PACKAGES; do for i in $PACKAGES; do
_install_pkg="${_install_pkg} ${MINGW_PACKAGE_PREFIX}-$i" _install_pkg="${_install_pkg} ${MINGW_PACKAGE_PREFIX}-$i"
done done
pacman -Sy pacman -Sy
pacman -S --noconfirm $_install_pkg pacman -S --noconfirm $_install_pkg
fi
if [ ! -f "$venv/bin/activate" ]; then if [ ! -f "$venv/bin/activate" ]; then
python -m venv --system-site-packages "$venv" python -m venv --system-site-packages "$venv"

View File

@ -1197,7 +1197,7 @@ class Game(GObject):
return cls( return cls(
savegame_root=data['savegame_root'], savegame_root=data['savegame_root'],
savegame_dir=data['savegame_dir'], savegame_dir=data['savegame_dir'],
variables=dict(((v['name'],v['value']) for v in data['variables'])) if ('variables' in data and config['variables']) else None, variables=dict([(v['name'],v['value']) for v in data['variables']]) if ('variables' in data and config['variables']) else None,
file_match=file_match if 'file_match' in data else None , file_match=file_match if 'file_match' in data else None ,
ignore_match=ignore_match if 'ignore_match' in data else None, ignore_match=ignore_match if 'ignore_match' in data else None,
installdir=data['installdir'] if ('installdir' in data and data['installdir']) else None installdir=data['installdir'] if ('installdir' in data and data['installdir']) else None