geändert: firmware-signieren.sh

firmware-signieren.sh

 #!/bin/sh
-git clone https://github.com/freifunk-gluon/gluon.git
-git clone git@git.ffnw.de:ffnw-firmware/siteconf.git gluon/site
+WORKINGDIR=$PWD
+if [ ! -d secret ]; then
+  ln -s $(find .. -wholename "*release_keys/secret*")
+fi
+if [ -d gluon ]; then
+  cd gluon;git pull
+else
+  git clone https://github.com/freifunk-gluon/gluon.git
+fi
+cd gluon
+if [ -d site ]; then
+  cd site;git pull
+else
+  git clone git@git.ffnw.de:ffnw-firmware/siteconf.git gluon/site
+fi
+cd $WORKINGDIR
 SITECONF=gluon/site/site.conf
-read -p "Wo liegt dein Signaturschlüssel? [$HOME/Dokumente/Freifunk/Firmware/release_keys]: " SECRETPATH
+read -p "Wo liegt dein Signaturschlüssel? [release_keys]: " SECRETPATH
 SECRETPATH=${SECRETPATH:-$HOME/Dokumente/Freifunk/Firmware/release_keys}
 read -p "Welches Release willst du signieren? [20191001]: " RELEASE
 RELEASE=${RELEASE:-20191001}
-FILE=stable.manifest.exp
+FILE=stable.manifest
 MYPUBKEY=$(ecdsakeygen -p < "$SECRETPATH"/secret)
 cd "$FREIFUNKPATH" || exit
-for RELEASE in $(git -C gluon/site/ tag | grep -E '2017[0-9]{4}' | grep -v 20171220);do scp files.ffnw.de:/var/www/dev/firmware/$RELEASE/sysupgrade/stable.manifest manifests/$RELEASE.manifest;done
-for VPN in fastd l2tp; do for RELEASE in $(git -C gluon/site/ tag | grep -E '(20171220|201[89][0-9]{4}|20[2-9][0-9]{4})');do scp files.ffnw.de:/var/www/dev/firmware/$VPN/$RELEASE/sysupgrade/stable.manifest manifests/$VPN.$RELEASE.manifest;done;done
-
+#~ for RELEASE in $(git -C gluon/site/ tag | grep -E '2017[0-9]{4}' | grep -v 20171220);do scp files.ffnw.de:/var/www/dev/firmware/$RELEASE/sysupgrade/stable.manifest manifests/$RELEASE.manifest;done
+#~ for VPN in fastd l2tp; do for RELEASE in $(git -C gluon/site/ tag | grep -E '(20171220|201[89][0-9]{4}|20[2-9][0-9]{4})');do scp files.ffnw.de:/var/www/dev/firmware/$VPN/$RELEASE/sysupgrade/stable.manifest manifests/$VPN.$RELEASE.manifest;done;done
 
 for VPN in l2tp fastd; do
   wget -qO $VPN.$RELEASE.$FILE https://firmware.ffnw.de/$VPN/$RELEASE/sysupgrade/$FILE