diff --git a/apps/.gitignore b/apps/.gitignore deleted file mode 100644 index ec39cf9..0000000 --- a/apps/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -*.AppImage -*.aria2 -*.sh diff --git a/apps/README.md b/apps/README.md index a1c815e..17533a1 100644 --- a/apps/README.md +++ b/apps/README.md @@ -10,7 +10,6 @@ These scripts are all targeted for using on x86_64 Linux systems with GLIBC. Script | Function | Source --- | --- | --- -`mkchrome ` | Latest official Chromium build | `mkgo ` | Latest official Go release | `mkjava ` | Accepts an argument for Java version and obtains that build from Adoptium | `mkmp3tag ` | Latest 64-bit Mp3tag release | diff --git a/apps/mkgo b/apps/mkgo index c5afccb..eb73e98 100755 --- a/apps/mkgo +++ b/apps/mkgo @@ -1,11 +1,11 @@ #!/bin/sh -PATH=$(dirname "$(readlink -f "${0}")")/..:$PATH -DIR=/tmp/appdwarf/go -mkdir -p $DIR -LINK=$(curl -sL https://go.dev/dl | grep -m1 linux | cut -d\" -f4) -curl -L https://go.dev/"$LINK" | tar xz -C$DIR/.. -appdwarf -b $DIR/AppRun -sed -i '4i export GOPROXY=direct' $DIR/AppRun -appdwarf $DIR "$@" -mv $DIR.sh go -rm -rf $DIR +APP=${0#./mk} +DIR=/tmp/appdwarf/$APP +mkdir -p "$DIR" +LINK=$(curl https://go.dev/dl/ | grep -m1 linux | cut -d\" -f4) +curl -L https://go.dev/"$LINK" | tar xz -C"$DIR"/.. +appdwarf -b "$DIR"/AppRun +sed -i '4i export GOPROXY=direct' "$DIR"/AppRun +appdwarf "$DIR" "$@" +mv "$DIR".sh "$APP" +rm -rf "$DIR" diff --git a/apps/mknode b/apps/mknode index bc6d303..6ad2dd8 100755 --- a/apps/mknode +++ b/apps/mknode @@ -5,8 +5,7 @@ mkdir -p "$DIR" LINK=$(curl https://nodejs.org/en/download/current/ | grep -m1 linux | cut -d\" -f4) curl -L "$LINK" | tar xJ -C"$DIR" mv "$DIR"/node*/* "$DIR" -strip "$DIR"/bin/node appdwarf -b "$DIR"/AppRun appdwarf "$DIR" -mv "$DIR".sh node +mv "$DIR".sh "$APP" rm -rf "$DIR" diff --git a/apps/mkpypy b/apps/mkpypy index d6e5cf4..a2f5b66 100755 --- a/apps/mkpypy +++ b/apps/mkpypy @@ -4,11 +4,10 @@ DIR=/tmp/appdwarf/$APP mkdir -p "$DIR" LINK="https://buildbot.pypy.org/nightly/py3.9/pypy-c-jit-latest-linux64.tar.bz2" curl -L "$LINK" | tar xj -C"$DIR" -ln -s bin/pypy "$DIR"/AppRun mv "$DIR"/pypy*/* "$DIR" -rm "$DIR"/bin/*.debug -"$DIR"/AppRun -m ensurepip -"$DIR"/AppRun -m pip install pipx +"$DIR"/bin/pypy -m ensurepip +"$DIR"/bin/pypy -m pip install pipx +appdwarf -b "$DIR"/AppRun appdwarf "$DIR" mv "$DIR".sh "$APP" rm -rf "$DIR"