Add icon to built exe, default run as admin with manifest, add bash runner script

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,21 +1,27 @@
 #!/bin/bash
-set -xeuo pipefail
+#set -x
 
 TOKEN=$(< token.txt)
-git commit -a
+EDITOR=nano git commit -a
+git push
 
 COMMIT=$(git log | head -n 1 | cut -d' ' -f2)
 echo $COMMIT
 export PATH=$PATH:"C:\Program Files\7-Zip"
-
-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": true,
+  "draft": false,
   "name": "Development release",
   "prerelease": true,
-  "tag_name": "testing",
+  "tag_name": "'$TAG'",
   "target_commitish": "'$COMMIT'"
 }'
 OUT=$(curl -X 'POST' \
@@ -26,9 +32,23 @@ OUT=$(curl -X 'POST' \
 
 ID=$(echo $OUT | cut -d',' -f 1 | cut -d':' -f 2)
 
-OUT=curl -X 'POST' \
+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'
+  -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')
+
+
+rm release-$COMMIT.zip
+rm IPPigeon-install.exe

run.sh

@@ -0,0 +1,2 @@
+"C:/Program Files/Python310/python.exe" setup.py build
+

setup.py

@@ -2,10 +2,10 @@ 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}
+build_exe_options = {"packages": ["os"], "excludes": ["tkinter"], "include_msvcr": True, "include_files": ["icon.png", "config.yml", "keyfile-admin.pem"], "optimize": 2}
 
 # base="Win32GUI" should be used only for Windows GUI app
 base = None
@@ -17,5 +17,5 @@ setup(
     version="0.2.4",
     description="IP Pigeon client application",
     options={"build_exe": build_exe_options},
-    executables=[Executable("ippigeon.py", base=base)],
+    executables=[Executable("ippigeon.py", base=base, icon="icon.ico", uac_admin=True, target_name="IPPigeon.exe")],
 )