fix sfx repack whoops

This commit is contained in:
ed 2020-11-30 03:27:27 +01:00
parent eafe2098b6
commit 19b09c898a
2 changed files with 9 additions and 7 deletions

View file

@ -19,7 +19,8 @@ set -e
# -rwxr-xr-x 0 ed ed 183808 Nov 19 00:43 copyparty-extras/sfx-lite/copyparty-sfx.py # -rwxr-xr-x 0 ed ed 183808 Nov 19 00:43 copyparty-extras/sfx-lite/copyparty-sfx.py
command -v gtar && tar=gtar || tar=tar command -v gtar && tar() { gtar "$@"; }
command -v gsed && sed() { gsed "$@"; }
td="$(mktemp -d)" td="$(mktemp -d)"
od="$(pwd)" od="$(pwd)"
cd "$td" cd "$td"
@ -29,7 +30,7 @@ pwd
# debug: if cache exists, use that instead of bothering github # debug: if cache exists, use that instead of bothering github
cache="$od/.copyparty-repack.cache" cache="$od/.copyparty-repack.cache"
[ -e "$cache" ] && [ -e "$cache" ] &&
$tar -xvf "$cache" || tar -xvf "$cache" ||
{ {
# get download links from github # get download links from github
curl https://api.github.com/repos/9001/copyparty/releases/latest | curl https://api.github.com/repos/9001/copyparty/releases/latest |
@ -44,7 +45,7 @@ cache="$od/.copyparty-repack.cache"
tr -d '\r' | tr '\n' '\0' | xargs -0 curl -L --remote-name-all tr -d '\r' | tr '\n' '\0' | xargs -0 curl -L --remote-name-all
# debug: create cache # debug: create cache
#$tar -czvf "$cache" * #tar -czvf "$cache" *
} }
@ -57,7 +58,7 @@ mv copyparty-*.tar.gz copyparty-extras/
# unpack the source code # unpack the source code
( cd copyparty-extras/ ( cd copyparty-extras/
$tar -xvf *.tar.gz tar -xvf *.tar.gz
) )
@ -71,6 +72,7 @@ chmod 755 \
( cd copyparty-extras/sfx-full/ ( cd copyparty-extras/sfx-full/
./copyparty-sfx.py -h ./copyparty-sfx.py -h
cd ../copyparty-*/ cd ../copyparty-*/
sed -ri 's`^command -v git >/dev/null`false`' ./scripts/make-sfx.sh # TODO remove on next rls
./scripts/make-sfx.sh re no-ogv no-cm ./scripts/make-sfx.sh re no-ogv no-cm
) )
@ -87,13 +89,13 @@ rm -rf copyparty-{0..9}*.*.*{0..9}
) )
# and include the repacker itself too # and include the repacker itself too
cp -pv "$od/$0" copyparty-extras/ cp -pv "$od/$0" copyparty-extras/
# create the bundle # create the bundle
fn=copyparty-$(date +%Y-%m%d-%H%M%S).tgz fn=copyparty-$(date +%Y-%m%d-%H%M%S).tgz
$tar -czvf "$od/$fn" * tar -czvf "$od/$fn" *
cd "$od" cd "$od"
rm -rf "$td" rm -rf "$td"

View file

@ -95,7 +95,7 @@ cd sfx
} }
ver= ver=
command -v git >/dev/null && { git describe --tags >/dev/null 2>/dev/null && {
git_ver="$(git describe --tags)"; # v0.5.5-2-gb164aa0 git_ver="$(git describe --tags)"; # v0.5.5-2-gb164aa0
ver="$(printf '%s\n' "$git_ver" | sed -r 's/^v//; s/-g?/./g')"; ver="$(printf '%s\n' "$git_ver" | sed -r 's/^v//; s/-g?/./g')";
t_ver= t_ver=