fix make-sfx macos support

This commit is contained in:
ed 2022-11-28 21:38:50 +00:00
parent e357aa546c
commit dc6bde594d
3 changed files with 6 additions and 3 deletions

2
.vscode/launch.py vendored
View file

@ -30,6 +30,8 @@ except:
argv = [os.path.expanduser(x) if x.startswith("~") else x for x in argv] 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)): if re.search(" -j ?[0-9]", " ".join(argv)):
argv = [sys.executable, "-m", "copyparty"] + argv argv = [sys.executable, "-m", "copyparty"] + argv
sp.check_call(argv) sp.check_call(argv)

View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
set -e set -e
outfile="$(realpath "$1")" outfile="$($(command -v realpath || command -v grealpath) "$1")"
[ -e genlic.sh ] || cd scripts [ -e genlic.sh ] || cd scripts
[ -e genlic.sh ] [ -e genlic.sh ]

View file

@ -50,10 +50,11 @@ help() { exec cat <<'EOF'
EOF EOF
} }
# port install gnutar findutils gsed coreutils # port install gnutar findutils gsed gawk coreutils
gtar=$(command -v gtar || command -v gnutar) || true gtar=$(command -v gtar || command -v gnutar) || true
[ ! -z "$gtar" ] && command -v gfind >/dev/null && { [ ! -z "$gtar" ] && command -v gfind >/dev/null && {
tar() { $gtar "$@"; } tar() { $gtar "$@"; }
tr() { gtr "$@"; }
sed() { gsed "$@"; } sed() { gsed "$@"; }
find() { gfind "$@"; } find() { gfind "$@"; }
sort() { gsort "$@"; } sort() { gsort "$@"; }
@ -232,7 +233,7 @@ tmpdir="$(
cp -pR ../scripts/strip_hints/ . cp -pR ../scripts/strip_hints/ .
) )
cp -pR ../scripts/py2/ . cp -pR ../scripts/py2 .
# msys2 tar is bad, make the best of it # msys2 tar is bad, make the best of it
echo collecting source echo collecting source