This commit is contained in:
ed
2022-02-13 03:10:53 +01:00
parent 98a90d49cb
commit b5f2fe2f0a
10 changed files with 289 additions and 8 deletions

View File

@@ -107,7 +107,7 @@ tmpdir="$(
[ $repack ] && {
old="$tmpdir/pe-copyparty"
echo "repack of files in $old"
cp -pR "$old/"*{dep-j2,copyparty} .
cp -pR "$old/"*{dep-j2,dep-ftp,copyparty} .
}
[ $repack ] || {
@@ -134,6 +134,19 @@ tmpdir="$(
mkdir dep-j2/
mv {markupsafe,jinja2} dep-j2/
echo collecting pyftpdlib
f="../build/pyftpdlib-1.5.6.tar.gz"
[ -e "$f" ] ||
(url=https://github.com/giampaolo/pyftpdlib/archive/refs/tags/release-1.5.6.tar.gz;
wget -O$f "$url" || curl -L "$url" >$f)
tar -zxf $f
mv pyftpdlib-release-*/pyftpdlib .
rm -rf pyftpdlib-release-* pyftpdlib/test
mkdir dep-ftp/
mv pyftpdlib dep-ftp/
# msys2 tar is bad, make the best of it
echo collecting source
[ $clean ] && {
@@ -331,7 +344,7 @@ nf=$(ls -1 "$zdir"/arc.* | wc -l)
echo gen tarlist
for d in copyparty dep-j2; do find $d -type f; done |
for d in copyparty dep-j2 dep-ftp; do find $d -type f; done |
sed -r 's/(.*)\.(.*)/\2 \1/' | LC_ALL=C sort |
sed -r 's/([^ ]*) (.*)/\2.\1/' | grep -vE '/list1?$' > list1

View File

@@ -11,6 +11,7 @@ copyparty/broker_mp.py,
copyparty/broker_mpw.py,
copyparty/broker_thr.py,
copyparty/broker_util.py,
copyparty/ftpd.py,
copyparty/httpcli.py,
copyparty/httpconn.py,
copyparty/httpsrv.py,

View File

@@ -387,7 +387,7 @@ def run(tmp, j2):
t.daemon = True
t.start()
ld = [tmp, os.path.join(tmp, "dep-j2")]
ld = [os.path.join(tmp, x) for x in ["", "dep-ftp", "dep-j2"]]
if j2:
del ld[-1]