Attachment 228986 Details for Bug 259404 – /usr/share/keys/pkg symlink for pkg root

[patch] /usr/share/keys/pkg symlink for pkg root

pkg32-fix.patch (text/plain), 2.04 KB, created by Alex S on 2021-10-24 16:08:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex S

Created: 2021-10-24 16:08:18 UTC

Size: 2.04 KB

patch

obsolete

>diff --git a/emulators/wine-devel/files/pkg32.sh b/emulators/wine-devel/files/pkg32.sh
>index 267fb8b38ca4..d75422997e12 100644
>--- a/emulators/wine-devel/files/pkg32.sh
>+++ b/emulators/wine-devel/files/pkg32.sh
>@@ -8,7 +8,12 @@ fi
> 
> I386_ROOT="${WINE_i386_ROOT:-$HOME/.i386-wine-pkg}"
> 
>-mkdir -p "$I386_ROOT"
>+if [ ! -d "$I386_ROOT/usr/share/keys/pkg" ]
>+then
>+  mkdir -p "$I386_ROOT/usr/share/keys"
>+  ln -s /usr/share/keys/pkg "$I386_ROOT/usr/share/keys/pkg"
>+fi
>+
> ABI=$(pkg config ABI | sed s/amd64/i386/)
> # Show what we're going to do, then do it.
> echo pkg -o ABI="$ABI" -o INSTALL_AS_USER=true -o RUN_SCRIPTS=false --rootdir "$I386_ROOT" "$@"
>diff --git a/emulators/wine-proton/files/pkg32.sh b/emulators/wine-proton/files/pkg32.sh
>index 7aebca5b7cd1..6e87ee27add3 100644
>--- a/emulators/wine-proton/files/pkg32.sh
>+++ b/emulators/wine-proton/files/pkg32.sh
>@@ -1,4 +1,5 @@
> #!/bin/sh -e
>+
> if [ "$(id -u)" = 0 ]
> then
>   echo "Don't run this script as root!"
>@@ -7,7 +8,12 @@ fi
> 
> I386_ROOT="${WINE_i386_ROOT:-$HOME/.i386-wine-pkg}"
> 
>-mkdir -p "$I386_ROOT"
>+if [ ! -d "$I386_ROOT/usr/share/keys/pkg" ]
>+then
>+  mkdir -p "$I386_ROOT/usr/share/keys"
>+  ln -s /usr/share/keys/pkg "$I386_ROOT/usr/share/keys/pkg"
>+fi
>+
> ABI=$(pkg config ABI | sed s/amd64/i386/)
> echo pkg -o ABI="$ABI" -o INSTALL_AS_USER=true -o RUN_SCRIPTS=false --rootdir "$I386_ROOT" "$@"
> exec pkg -o ABI="$ABI" -o INSTALL_AS_USER=true -o RUN_SCRIPTS=false --rootdir "$I386_ROOT" "$@"
>diff --git a/emulators/wine/files/pkg32.sh b/emulators/wine/files/pkg32.sh
>index 267fb8b38ca4..d75422997e12 100644
>--- a/emulators/wine/files/pkg32.sh
>+++ b/emulators/wine/files/pkg32.sh
>@@ -8,7 +8,12 @@ fi
> 
> I386_ROOT="${WINE_i386_ROOT:-$HOME/.i386-wine-pkg}"
> 
>-mkdir -p "$I386_ROOT"
>+if [ ! -d "$I386_ROOT/usr/share/keys/pkg" ]
>+then
>+  mkdir -p "$I386_ROOT/usr/share/keys"
>+  ln -s /usr/share/keys/pkg "$I386_ROOT/usr/share/keys/pkg"
>+fi
>+
> ABI=$(pkg config ABI | sed s/amd64/i386/)
> # Show what we're going to do, then do it.
> echo pkg -o ABI="$ABI" -o INSTALL_AS_USER=true -o RUN_SCRIPTS=false --rootdir "$I386_ROOT" "$@"

Actions: View | Diff

Attachments on bug 259404: 228986