mirror of https://github.com/Phantop/appdwarf.git
Clean up mkwine/mkproton and remove APPDWARF_CMD
This commit is contained in:
parent
07c585bb0a
commit
478c0ad56a
2
AppRun
2
AppRun
|
|
@ -1,4 +1,4 @@
|
|||
#!/bin/sh
|
||||
export PATH="${APPDIR}":"${APPDIR}"/bin:"$PATH"
|
||||
export PATH="${APPDIR}"/bin:"$PATH"
|
||||
export LD_LIBRARY_PATH="${APPDIR}"/lib64:"${APPDIR}"/lib:"$LD_LIBRARY_PATH"
|
||||
exec "$APPDIR/$ARGV0" "$@"
|
||||
|
|
|
|||
|
|
@ -15,11 +15,12 @@ Script | Function | Source
|
|||
`mkchrome ` | Latest official Chromium build | <https://download-chromium.appspot.com>
|
||||
`mkgo ` | Latest official Go release | <https://go.dev>
|
||||
`mkjava ` | Accepts an argument for Java version and obtains that build from Adoptium | <https://adoptium.net>
|
||||
`mkmp3tag ` | Latest 64-bit Mp3tag release | <https://mp3tag.de/en>
|
||||
`mknode ` | Latest official NodeJS release | <https://nodejs.org>
|
||||
`mkproton ` | GloriousEggroll Proton Builds | <https://github.com/GloriousEggroll/proton-ge-custom>
|
||||
`mkpypy ` | Latest PyPy3 release | <https://www.pypy.org>
|
||||
`mkrust ` | Latest Rust nightly | <https://rust-lang.org>
|
||||
`mktex ` | Minimal/custom TeX Live image | <https://ctan.org>
|
||||
`mkwine ` | Latest `wine-staging-tkg` release | <https://github.com/Kron4ek/Wine-Builds>
|
||||
`mkwine proton` | GloriousEggroll Proton Builds | <https://github.com/GloriousEggroll/proton-ge-custom>
|
||||
`rustsolus` | Latest Rust stable from the Solus repos (requires `eopkg` and may not work on other distros) | <https://getsol.us>
|
||||
`ungoogled` | Latest submitted `ungoogled-chromium` binary release | <https://ungoogled-software.github.io/ungoogled-chromium-binaries>
|
||||
|
|
|
|||
|
|
@ -1,40 +0,0 @@
|
|||
#!/bin/sh
|
||||
PATH=$(dirname "$(readlink -f "${0}")")/..:$PATH
|
||||
DIR=/tmp/appdwarf/proton
|
||||
mkdir -p $DIR
|
||||
|
||||
LINK="$(curl https://api.github.com/repos/GloriousEggroll/proton-ge-custom/releases | grep -om1 http.\*tar.gz)"
|
||||
curl -L "$LINK" | tar xz -C$DIR
|
||||
mv $DIR/GE-Proton*/files/* $DIR
|
||||
rm -rf $DIR/GE-Proton*/
|
||||
|
||||
wget -O$DIR/winetricks https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks
|
||||
chmod +x $DIR/winetricks
|
||||
|
||||
cat > $DIR/AppRun << 'EOF'
|
||||
#!/bin/sh
|
||||
HERE=$(dirname "$(readlink -f "${0}")")
|
||||
|
||||
export WINE="${HERE}"/bin/wine
|
||||
export WINE64="${HERE}"/bin/wine64
|
||||
export WINESERVER="${HERE}"/bin/wineserver
|
||||
export WINETRICKS="${HERE}"/winetricks
|
||||
export DXVK_STATE_CACHE_PATH=~/.cache DXVK_LOG_PATH=none
|
||||
|
||||
if [ "$1" = "winetricks" ]; then
|
||||
if [ $# -ge 2 ]; then
|
||||
shift
|
||||
"${WINETRICKS}" "$@"
|
||||
else
|
||||
"${WINETRICKS}" --help
|
||||
fi
|
||||
else
|
||||
"${WINE}" "$@"
|
||||
"${WINESERVER}" -w
|
||||
fi
|
||||
EOF
|
||||
chmod +x $DIR/AppRun
|
||||
|
||||
appdwarf $DIR "$@"
|
||||
rm -rf $DIR
|
||||
mv $DIR.sh proton
|
||||
32
apps/mkwine
32
apps/mkwine
|
|
@ -4,33 +4,23 @@ DIR=/tmp/appdwarf/wine
|
|||
mkdir -p $DIR
|
||||
|
||||
LINK="$(curl https://api.github.com/repos/Kron4ek/Wine-Builds/releases | grep -om1 http.\*-staging-tkg-amd64.tar.xz)"
|
||||
curl -L "$LINK" | tar xJ -C$DIR
|
||||
mv $DIR/wine*/* $DIR
|
||||
rmdir $DIR/wine*/
|
||||
[ "$1" = "proton" ] && LINK="$(curl https://api.github.com/repos/GloriousEggroll/proton-ge-custom/releases | grep -om1 http.\*tar.gz)" && shift
|
||||
curl -L "$LINK" | bsdtar xf - -C$DIR
|
||||
mv $DIR/wine*/* $DIR/GE-Proton*/files/* $DIR
|
||||
rm -rf $DIR/wine*/ $DIR/GE-Proton*/
|
||||
|
||||
wget -O$DIR/winetricks https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks
|
||||
chmod +x $DIR/winetricks
|
||||
wget -O$DIR/bin/winetricks https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks
|
||||
chmod +x $DIR/bin/winetricks
|
||||
|
||||
cat > $DIR/AppRun << 'EOF'
|
||||
#!/bin/sh
|
||||
HERE=$(dirname "$(readlink -f "${0}")")
|
||||
export WINE="${HERE}"/bin/wine
|
||||
export WINE64="${HERE}"/bin/wine64
|
||||
export WINESERVER="${HERE}"/bin/wineserver
|
||||
export WINETRICKS="${HERE}"/winetricks
|
||||
export WINE="$APPDIR"/bin/wine
|
||||
export WINE64="$WINE"64 WINESERVER="$WINE"server WINETRICKS="$WINE"tricks
|
||||
export DXVK_STATE_CACHE_PATH=~/.cache DXVK_LOG_PATH=none
|
||||
|
||||
if [ "$1" = "winetricks" ]; then
|
||||
if [ $# -ge 2 ]; then
|
||||
shift
|
||||
"${WINETRICKS}" "$@"
|
||||
else
|
||||
"${WINETRICKS}" --help
|
||||
fi
|
||||
else
|
||||
"${WINE}" "$@"
|
||||
"${WINESERVER}" -w
|
||||
fi
|
||||
[ "$1" = "winetricks" ] && shift && exec "$WINETRICKS" "$@"
|
||||
"$WINE64" "$@"
|
||||
"$WINESERVER" -w
|
||||
EOF
|
||||
chmod +x $DIR/AppRun
|
||||
|
||||
|
|
|
|||
20
header
20
header
|
|
@ -1,17 +1,11 @@
|
|||
#!/bin/sh
|
||||
# shellcheck disable=SC2086,SC2155
|
||||
export APPDIR="/tmp/dwarf_$(basename "$0")$(echo "$0" | md5sum | head -c5)"
|
||||
export APPIMAGE="$0"
|
||||
export ARGV0="$(basename "$0")"
|
||||
export OWD="$PWD"
|
||||
export APPDWARF_CMD="$(basename "$0")"
|
||||
if [ ! -d "$APPDIR" ]; then
|
||||
mkdir "$APPDIR"
|
||||
ARG="-o offset=auto -o tidy_strategy=swap -o workers=4"
|
||||
dwarfs $ARG "$0" "$APPDIR" 2>/dev/null
|
||||
fi
|
||||
ARGV0="$(basename "$0")"; APPDIR="/tmp/dwarf_$ARGV0$(echo "$0"|md5sum|head -c5)"
|
||||
export APPIMAGE="$0" OWD="$PWD" ARGV0 APPDIR
|
||||
[ ! -d "$APPDIR" ] && mkdir "$APPDIR" &&
|
||||
dwarfs -o offset=auto -o tidy_strategy=swap -o workers=4 "$0" "$APPDIR" 2>&1|:
|
||||
|
||||
"$APPDIR/AppRun" "$@"
|
||||
res=$?
|
||||
fusermount -quz "$APPDIR"
|
||||
rmdir "$APPDIR" 2> /dev/null
|
||||
exit
|
||||
rmdir "$APPDIR" /dev/null
|
||||
exit $res
|
||||
|
|
|
|||
Loading…
Reference in New Issue