Less hardcoded paths

diff --git a/makedist b/makedist
index 760ac1ff6d91fab1484a7519a1eaa5da0c2b414ad3c46a0d6337d38cf9533e2c..6fc58983c59cbbe7c2c0c019d0a54875862639f12135b3d2412e24b2cd83b70d 100755 (executable)
--- a/makedist
+++ b/makedist
@@ -42,8 +42,8 @@ cd ../../cm
 go mod vendor
 rm -r vendor/golang.org/x/sys/windows
 cd ..
-$HOME/work/sgodup/sgodup -basedir cm/vendor -dupdir cmd/pp/vendor -action hardlink
-$HOME/work/sgodup/sgodup -basedir cm/vendor -dupdir vendor -action hardlink
+sgodup -basedir cm/vendor -dupdir cmd/pp/vendor -action hardlink
+sgodup -basedir cm/vendor -dupdir vendor -action hardlink
 cd ..
 
 cd spec
@@ -61,18 +61,21 @@ rm -fr .git makedist
 mkdir third-party
 
 cd ..
-zstd -d <$HOME/work/bass/build/distfiles/libtap-0.1.0-44-gb53e4ef.tar.zst >keks-"$release"/third-party/libtap-0.1.0-44-gb53e4ef.tar
-zstd -d <$HOME/src/monocypher-4.0.2.tar.zst >keks-"$release"/third-party/monocypher-4.0.2.tar
-zstd -d <$HOME/work/goredo/doc/goredo.html/download/goredo-2.6.4.tar.zst >keks-"$release"/third-party/goredo-2.6.4.tar
-
-git clone $HOME/work/sharness sharness-v1.2.1
+zstd -d <$cur/third-party/libtap-0.1.0-44-gb53e4ef.tar.zst \
+    >keks-"$release"/third-party/libtap-0.1.0-44-gb53e4ef.tar
+zstd -d <$cur/third-party/monocypher-4.0.2.tar.zst \
+    >keks-"$release"/third-party/monocypher-4.0.2.tar
+zstd -d <$cur/third-party/goredo-2.6.4.tar.zst \
+    >keks-"$release"/third-party/goredo-2.6.4.tar
+
+git clone $cur/third-party/sharness sharness-v1.2.1
 cd sharness-v1.2.1
 git checkout v1.2.1
 rm -fr .git
 cd ..
 detpax sharness-v1.2.1 >keks-"$release"/third-party/sharness-v1.2.1.tar
 
-git clone $HOME/work/swg swg-v1.0.0
+git clone $cur/third-party/swg swg-v1.0.0
 cd swg-v1.0.0
 git checkout v1.0.0
 rm -fr .git
@@ -87,8 +90,8 @@ meta4ra-create -fn "$tarball" -mtime "$tarball" \
     -sig-ssh "$tarball".sig \
     http://www.keks.cypherpunks.su/download/"$tarball" \
     http://y.www.keks.cypherpunks.su/download/"$tarball" <"$tarball" >"$tarball".meta4
-cmsigtool -d 4<$HOME/.cm/sign/keks@cypherpunks.su.pub \
-    8<$HOME/.cm/sign/keks@cypherpunks.su.prv <"$tarball" >"$tarball".sig
+cmsigtool -d 4<$cur/.cm/sign/keks@cypherpunks.su.pub \
+    8<$cur/.cm/sign/keks@cypherpunks.su.prv <"$tarball" >"$tarball".sig
 touch -r "$tarball" "$tarball".sig
 
 size=$(( $(stat -f %z $tarball) / 1024 ))

diff --git a/spec/mk-html b/spec/mk-html
index 21d9ff354aea5da03ee4acae1912ab698569c503ed4a51260592ba5eb7182f32..2c2744e6cdc1b4c7695e89c5a22cd74f336a1e62d50ec824c2cfc0b112d3ed14 100755 (executable)
--- a/spec/mk-html
+++ b/spec/mk-html
@@ -8,15 +8,17 @@ for pub in PUBKEY-CM.pub PUBKEY-CM.pub.asc PUBKEY-SSH.pub PUBKEY-SSH.pub.asc ; d
     [ -e $html/$pub ] || ln ../$pub $html
 done
 
-(
-    cd $html/download
-    export ATOM_ID="d18c0516-d0a8-44ee-b5b6-656591c9e520"
-    export NAME=keks
-    export BASE_URL=http://www.keks.cypherpunks.su/download
-    export AUTHOR_EMAIL=keks@cypherpunks.su
-    releases.atom.zsh || :
-)
-perl -i -npe 'print "<link rel=\"alternate\" title=\"Releases\" href=\"download/releases.atom\" type=\"application/atom+xml\">\n" if /^<\/head>/' $html/INSTALL.html
+if [ -d $html/download ] ; then
+    (
+        cd $html/download
+        export ATOM_ID="d18c0516-d0a8-44ee-b5b6-656591c9e520"
+        export NAME=keks
+        export BASE_URL=http://www.keks.cypherpunks.su/download
+        export AUTHOR_EMAIL=keks@cypherpunks.su
+        releases.atom.zsh || :
+    )
+    perl -i -npe 'print "<link rel=\"alternate\" title=\"Releases\" href=\"download/releases.atom\" type=\"application/atom+xml\">\n" if /^<\/head>/' $html/INSTALL.html
+fi
 
 find $html -type d -exec chmod 755 {} +
 find $html -type f -exec chmod 644 {} +