freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

emulators/wine: Add error handling to WoW 32-bit setup

Browse Source 
Abstract ABI_FILE and check for its existence before using it.

On the way change formatting to consume less vertical space.

PR:		278525
This commit is contained in:
Gerald Pfeifer
2025-07-04 07:43:37 +00:00
parent 87001e022b
commit 497de78408
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
emulators/wine/Makefile
+1 -1
View File
@@ -1,6 +1,6 @@
PORTNAME= wine PORTNAME= wine
DISTVERSION= 10.0 DISTVERSION= 10.0
PORTREVISION= 1 PORTREVISION= 2
PORTEPOCH= 1 PORTEPOCH= 1
CATEGORIES= emulators CATEGORIES= emulators
MASTER_SITES= https://dl.winehq.org/wine/source/10.0/ MASTER_SITES= https://dl.winehq.org/wine/source/10.0/
emulators/wine/files/pkg32.sh
+10 -6
View File
@@ -1,19 +1,23 @@
#!/bin/sh -e #!/bin/sh -e
if [ "$(id -u)" = 0 ] if [ "$(id -u)" = 0 ]; then
then
echo "Don't run this script as root!" echo "Don't run this script as root!"
exit 1 exit 1
fi fi
I386_ROOT="${WINE_i386_ROOT:-$HOME/.i386-wine-pkg}" I386_ROOT="${WINE_i386_ROOT:-$HOME/.i386-wine-pkg}"
ABI_FILE=/usr/lib32/libc.so.7
if [ ! -d "$I386_ROOT/usr/share/keys/pkg" ] if [ ! -f $ABI_FILE ]; then
then echo "\"$ABI_FILE\" not found; exiting."
exit 1
fi
if [ ! -d "$I386_ROOT/usr/share/keys/pkg" ]; then
mkdir -p "$I386_ROOT/usr/share/keys" mkdir -p "$I386_ROOT/usr/share/keys"
ln -s /usr/share/keys/pkg "$I386_ROOT/usr/share/keys/pkg" ln -s /usr/share/keys/pkg "$I386_ROOT/usr/share/keys/pkg"
fi fi
# Show what we're going to do, then do it. # Show what we're going to do, then do it.
echo pkg -o ABI_FILE=/usr/lib32/libc.so.7 -o INSTALL_AS_USER=true -o RUN_SCRIPTS=false --rootdir "$I386_ROOT" "$@" echo pkg -o ABI_FILE=$ABI_FILE -o INSTALL_AS_USER=true -o RUN_SCRIPTS=false --rootdir "$I386_ROOT" "$@"
exec pkg -o ABI_FILE=/usr/lib32/libc.so.7 -o INSTALL_AS_USER=true -o RUN_SCRIPTS=false --rootdir "$I386_ROOT" "$@" exec pkg -o ABI_FILE=$ABI_FILE -o INSTALL_AS_USER=true -o RUN_SCRIPTS=false --rootdir "$I386_ROOT" "$@"