Install into subfolder

ippigeon.py

@@ -1,4 +1,4 @@
-
+import os
 import sys
 import subprocess
 from multiprocessing import Process, Manager, Pool, TimeoutError, freeze_support, active_children
@@ -47,8 +47,8 @@ def netstat_done(res):
 
 def process_done(res):
     fprint("uploading to sftp...")
-    ssh.sftp_send_data(res, config, datafile)
-    #procdata_res = pool.apply_async(ssh.sftp_send_data, (res, config, datafile))
+    #ssh.sftp_send_data(res, config, datafile)
+    procdata_res = pool.apply_async(ssh.sftp_send_data, (res, config, datafile))
     
 
 

release.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-set -x
+#set -x
 
 TOKEN=$(< token.txt)
 EDITOR=nano git commit -a
@@ -8,15 +8,20 @@ git push
 COMMIT=$(git log | head -n 1 | cut -d' ' -f2)
 echo $COMMIT
 export PATH=$PATH:"C:\Program Files\7-Zip"
-DATE=$(date +%s)
-7z a -r release-$COMMIT.zip ./build/exe.win-amd64-3.10/*
-
+TAG=$(date +%s)
+"C:/Program Files/Python310/python.exe" setup.py build
+sleep 2
+mv ./build/exe.win-amd64-3.10/ ./build/ippigeon-win
+7z a -r release-$COMMIT.zip ./build/ippigeon-win
+7z a -sfx7z.sfx IPPigeon-install.exe ./build/ippigeon-win
+mv ./build/ippigeon-win/ ./build/exe.win-amd64-3.10
+#sleep 30
 DATA='{
   "body": "Autogenerated release",
   "draft": false,
   "name": "Development release",
   "prerelease": true,
-  "tag_name": "'$DATE'",
+  "tag_name": "'$TAG'",
   "target_commitish": "'$COMMIT'"
 }'
 OUT=$(curl -X 'POST' \
@@ -27,12 +32,23 @@ OUT=$(curl -X 'POST' \
 
 ID=$(echo $OUT | cut -d',' -f 1 | cut -d':' -f 2)
 
+OUT=$(curl -X 'POST' \
+  'https://git.deck.sh/api/v1/repos/Interfaz/ff/releases/'$ID'/assets?token='$TOKEN'' \
+  -H 'accept: application/json' \
+  -H 'Content-Type: multipart/form-data' \
+  -F 'attachment=@IPPigeon-install.exe;type=application/octet-stream')
+
+URL=$(echo $OUT | cut -d',' -f 7 | cut -d\" -f4)
+
+curl -d "$URL" https://notify.deck.sh/ipro-release
+echo $URL
+
 OUT=$(curl -X 'POST' \
   'https://git.deck.sh/api/v1/repos/Interfaz/ff/releases/'$ID'/assets?token='$TOKEN'' \
   -H 'accept: application/json' \
   -H 'Content-Type: multipart/form-data' \
   -F 'attachment=@'release-$COMMIT.zip';type=application/x-zip-compressed')
 
-URL=$(echo $OUT | cut -d',' -f 6 | cut -d\" -f4)
-echo $URL
-rm release-$COMMIT.zip
+
+rm release-$COMMIT.zip
+rm IPPigeon-install.exe

setup.py

@@ -2,7 +2,7 @@ import sys
 from cx_Freeze import setup, Executable
 
 debug = True
-debug = not debug
+#debug = not debug
 # Dependencies are automatically detected, but it might need fine tuning.
 # "packages": ["os"] is used as example only
 build_exe_options = {"packages": ["os"], "excludes": ["tkinter"], "include_msvcr": True, "include_files": ["icon.png", "IPPigeon.lnk", "config.yml", "keyfile-admin.pem"], "optimize": 2}