diff --git a/.vscode/launch.py b/.vscode/launch.py index 16f1d284..8f7491b2 100755 --- a/.vscode/launch.py +++ b/.vscode/launch.py @@ -30,6 +30,8 @@ except: argv = [os.path.expanduser(x) if x.startswith("~") else x for x in argv] +argv += sys.argv[1:] + if re.search(" -j ?[0-9]", " ".join(argv)): argv = [sys.executable, "-m", "copyparty"] + argv sp.check_call(argv) diff --git a/scripts/genlic.sh b/scripts/genlic.sh index 173506db..2eb4cc92 100755 --- a/scripts/genlic.sh +++ b/scripts/genlic.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e -outfile="$(realpath "$1")" +outfile="$($(command -v realpath || command -v grealpath) "$1")" [ -e genlic.sh ] || cd scripts [ -e genlic.sh ] diff --git a/scripts/make-sfx.sh b/scripts/make-sfx.sh index 807725a1..dae7b303 100755 --- a/scripts/make-sfx.sh +++ b/scripts/make-sfx.sh @@ -50,10 +50,11 @@ help() { exec cat <<'EOF' EOF } -# port install gnutar findutils gsed coreutils +# port install gnutar findutils gsed gawk coreutils gtar=$(command -v gtar || command -v gnutar) || true [ ! -z "$gtar" ] && command -v gfind >/dev/null && { tar() { $gtar "$@"; } + tr() { gtr "$@"; } sed() { gsed "$@"; } find() { gfind "$@"; } sort() { gsort "$@"; } @@ -232,7 +233,7 @@ tmpdir="$( cp -pR ../scripts/strip_hints/ . ) - cp -pR ../scripts/py2/ . + cp -pR ../scripts/py2 . # msys2 tar is bad, make the best of it echo collecting source