diff --git a/decl-to-pkg.sh b/decl-to-pkg.sh index 2068bba..ca7f733 100755 --- a/decl-to-pkg.sh +++ b/decl-to-pkg.sh @@ -69,12 +69,6 @@ then VERSION="1.0" fi -if [ ! -f "$LOCAL_URL" ] -then - printf "Error: Package %s not on local server.\n" "$NAME" >&2 - exit 2 -fi - AUTHOR_SHORT=$(echo "$AUTHOR" | sed 's/ /_/g' | sed 's/\,//g'| sed 's/-//g' | sed "s|'||g" ) VERSION_SHORT=$(strtolower "$VERSION" | sed 's/ /_/g') diff --git a/fix-unknown.sh b/fix-unknown.sh deleted file mode 100755 index c6f8476..0000000 --- a/fix-unknown.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -rm SCP_FILES -rm -rf ./pkgs - -find ./ -type f -print | grep \\.decl | sort > tmplist1 -cat tmplist1 - -TOTAL_PKGS=$(wc -l tmplist1) -COUNTER=0 - -cat tmplist1 | while read DECL -do - COUNTER=$((COUNTER+1)) - echo "($COUNTER/$TOTAL_PKGS) $DECL" - - AUTHOR=$(grep "Unknown" "$DECL") - - if [ -n "$AUTHOR" ] - then - LOCAL_FILE=$(grep "local_url" "$DECL" | awk '{ print $2; }') - echo "ark $LOCAL_FILE" - printf "Author: " - read AUTHORNAME - printf "\n" - sed -i "s|Unknown|$AUTHORNAME|g" "$DECL" - fi -done - -rm tmplist diff --git a/index-decl.sh b/index-decl.sh index 28b6da6..8a83fd0 100755 --- a/index-decl.sh +++ b/index-decl.sh @@ -97,26 +97,26 @@ then if [ ! -f "./index/$PKGNAME/qhash" ] then - QHASH=$(./fteqw -qhash -prefix "$PACKPREFIX" "$LOCAL_URL") + QHASH=$(./fteqw64 -qhash -prefix "$PACKPREFIX" "$LOCAL_URL") echo "$QHASH" > ./index/$PKGNAME/qhash echo "Recalculated QHASH: $QHASH" fi if [ ! -f "./index/$PKGNAME/signature" ] then - SIGNATURE=$(./fteqw -privkey ./private-key.pem -pubkey ./public-key.pem -prefix "$PACKPREFIX" -certhost $AUTH_HOST -sign2 "$LOCAL_URL") + SIGNATURE=$(./fteqw64 -privkey ./private-key.pem -pubkey ./public-key.pem -prefix "$PACKPREFIX" -certhost $AUTH_HOST -sign2 "$LOCAL_URL") echo "$SIGNATURE" > ./index/$PKGNAME/signature echo "Recalculated SIGNATURE: $SIGNATURE" fi else if [ ! -f "./index/$PKGNAME/qhash" ] then - QHASH=$(./fteqw -qhash "$LOCAL_URL") + QHASH=$(./fteqw64 -qhash "$LOCAL_URL") fi if [ ! -f "./index/$PKGNAME/signature" ] then - SIGNATURE=$(./fteqw -privkey ./private-key.pem -pubkey ./public-key.pem -certhost $AUTH_HOST -sign2 "$LOCAL_URL") + SIGNATURE=$(./fteqw64 -privkey ./private-key.pem -pubkey ./public-key.pem -certhost $AUTH_HOST -sign2 "$LOCAL_URL") echo "$SIGNATURE" > ./index/$PKGNAME/signature echo "Recalculated SIGNATURE: $SIGNATURE" fi diff --git a/start.sh b/start.sh index 480cb43..e16d89c 100755 --- a/start.sh +++ b/start.sh @@ -25,7 +25,7 @@ do OUTPUT="$(basename "$PKGLIST")" echo "version 2" > tmplist0 cat "$PKGLIST" >> tmplist0 - sig=$(./fteqw -privkey ./private-key.pem -pubkey ./public-key.pem -certhost $AUTH_HOST -sign2 tmplist0) + sig=$(./fteqw64 -privkey ./private-key.pem -pubkey ./public-key.pem -certhost $AUTH_HOST -sign2 tmplist0) head -n 1 tmplist0 > "$OUTPUT" echo "signature \"$AUTH_HOST\" \"$sig\"" >> "$OUTPUT" tail -n +2 tmplist0 >> "$OUTPUT"