Merge branch 'master' of https://github.com/radicallyopensecurity/pentext into development

# Conflicts:
#	chatops/bash/handler_build

chatops/bash/handler_build

@@ -120,6 +120,7 @@ build() {
 add_to_repo() {
     git add $TARGETPDF
     git add target/waiver_?*.pdf &>/dev/null
+    git add target/execsummary.pdf &>/dev/null
     git commit -q -m "$TARGETPDF proudly manufactured using ChatOps" &>/dev/null
     git push -q >/dev/null
 }

chatops/bash/releaser.sh

@@ -42,7 +42,7 @@ if [ -f ${source} ]; then
     else
         cp -v ${source} ${fullname}
         PASS=$(head -c 25 /dev/random | base64 | head -c 25)
-        zip --password ${PASS} "${fullname}.zip" ${fullname} 2>/dev/null && echo "Zip file encrypted with password '${PASS}'"
+        7z a -p${PASS} "${fullname}.zip" ${fullname} 2>/dev/null && echo "Zip file encrypted with password '${PASS}'"
     fi
 else
     echo "Could not find source ${source}"