From bc4f6d9b60eec1b3902a0ce1c90bf1d35432d679 Mon Sep 17 00:00:00 2001
From: Oleksii Shevchuk <ol.shevchuk@samsung.com>
Date: Wed, 5 Jul 2017 13:11:03 +0300
Subject: [PATCH] Make sure bundles always build / windows

---
 client/sources/buildenv.sh | 76 ++++++++++++++++++++------------------
 1 file changed, 41 insertions(+), 35 deletions(-)

diff --git a/client/sources/buildenv.sh b/client/sources/buildenv.sh
index b0bab293..551da3c0 100755
--- a/client/sources/buildenv.sh
+++ b/client/sources/buildenv.sh
@@ -24,21 +24,54 @@ PACKAGES="$PACKAGES mss pyaudio https://github.com/secdev/scapy/archive/master.z
 
 BUILDENV=${1:-`pwd`/buildenv}
 
-if [ -f $BUILDENV/.ready ]; then
-    echo "Buildenv at $BUILDENV already prepared"
-    exit 0
-fi
-
-exec < /dev/null
-
 WINE=${WINE:-wine}
 WINE32="$BUILDENV/win32"
 WINE64="$BUILDENV/win64"
 DOWNLOADS="$BUILDENV/downloads"
 
+create_templates() {
+    TEMPLATES=`readlink -f ../../pupy/payload_templates`
+
+    cd $WINE32/drive_c/Python27
+    rm -f ${TEMPLATES}/windows-x86.zip
+    for dir in Lib DLLs; do
+	cd $dir
+	zip -q -y \
+	    -x "*.a" -x "*.o" -x "*.whl" -x "*.txt" -x "*.py" -x "*.pyc" -x "*.chm" \
+	    -x "*test/*" -x "*tests/*" -x "*examples/*" -x "pythonwin/*" \
+	    -x "idlelib/*" -x "lib-tk/*" -x "tk*"  -x "tcl*" \
+	    -x "*.egg-info/*" -x "*.dist-info/*" -x "*.exe" \
+	    -r9 ${TEMPLATES}/windows-x86.zip .
+	cd -
+    done
+
+    cd $WINE64/drive_c/Python27
+    rm -f ${TEMPLATES}/windows-amd64.zip
+
+    for dir in Lib DLLs; do
+	cd $dir
+	zip -q -y \
+	    -x "*.a" -x "*.o" -x "*.whl" -x "*.txt" -x "*.py" -x "*.pyc" -x "*.chm" \
+	    -x "*test/*" -x "*tests/*" -x "*examples/*"  -x "pythonwin/*" \
+	    -x "idlelib/*" -x "lib-tk/*" -x "tk*"  -x "tcl*" \
+	    -x "*.egg-info/*" -x "*.dist-info/*" -x "*.exe" \
+	    -r9 ${TEMPLATES}/windows-amd64.zip .
+	cd -
+    done
+}
+
+if [ -f $BUILDENV/.ready ]; then
+    echo "Buildenv at $BUILDENV already prepared"
+    create_templates
+    exit 0
+fi
+
+
 MINGW64=${MINGW64:-x86_64-w64-mingw32-g++}
 MINGW32=${MINGW32:-i686-w64-mingw32-g++}
 
+exec < /dev/null
+
 WINPTY=../../pupy/external/winpty
 
 mkdir -p "$BUILDENV"
@@ -205,35 +238,8 @@ mv ${WINPTY}/build/winpty.dll ${BUILDENV}/win64/drive_c/Python27/DLLs/
 
 echo "[+] Creating bundles"
 
-TEMPLATES=`readlink -f ../../pupy/payload_templates`
-
 OPWD=`pwd`
 
-cd $WINE32/drive_c/Python27
-rm -f ${TEMPLATES}/windows-x86.zip
-for dir in Lib DLLs; do
-    cd $dir
-    zip -q -y \
-	-x "*.a" -x "*.o" -x "*.whl" -x "*.txt" -x "*.py" -x "*.pyc" -x "*.chm" \
-	-x "*test/*" -x "*tests/*" -x "*examples/*" -x "pythonwin/*" \
-	-x "idlelib/*" -x "lib-tk/*" -x "tk*"  -x "tcl*" \
-	-x "*.egg-info/*" -x "*.dist-info/*" -x "*.exe" \
-	-r9 ${TEMPLATES}/windows-x86.zip .
-    cd -
-done
-
-cd $WINE64/drive_c/Python27
-rm -f ${TEMPLATES}/windows-amd64.zip
-
-for dir in Lib DLLs; do
-    cd $dir
-    zip -q -y \
-	-x "*.a" -x "*.o" -x "*.whl" -x "*.txt" -x "*.py" -x "*.pyc" -x "*.chm" \
-	-x "*test/*" -x "*tests/*" -x "*examples/*"  -x "pythonwin/*" \
-	-x "idlelib/*" -x "lib-tk/*" -x "tk*"  -x "tcl*" \
-	-x "*.egg-info/*" -x "*.dist-info/*" -x "*.exe" \
-	-r9 ${TEMPLATES}/windows-amd64.zip .
-    cd -
-done
+create_templates
 
 touch $BUILDENV/.ready