From 6acf1a180223f34ee55e9d75787972ff982f70c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Jastrz=C4=99bski?= <pawelj@iosphe.re>
Date: Fri, 10 Nov 2017 19:10:23 +0100
Subject: [PATCH] Updated build enviroment

---
 .gitignore                 |   7 +++----
 appveyor.yml               |   4 +---
 other/windows/Cert.pfx.enc | Bin 3520 -> 0 bytes
 setup.bat                  |   4 ----
 setup.py                   |   4 ----
 5 files changed, 4 insertions(+), 15 deletions(-)
 delete mode 100644 other/windows/Cert.pfx.enc
 delete mode 100644 setup.bat

diff --git a/.gitignore b/.gitignore
index 6b1ecfed..6877d7a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,16 +1,15 @@
 *.pyc
 *.cbz
 *.cbr
+*.spec
 .idea
 .DS_Store
+.python-version
 Thumbs.db
 dist
 Output
-test
-solaio
 kindlegen*
-*.spec
+setup.bat
 kindlecomicconverter/sentry.py
 build/
-.python-version
 KindleComicConverter.egg-info/
diff --git a/appveyor.yml b/appveyor.yml
index 1fb13e10..44cd72b9 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -7,15 +7,13 @@ install:
   - "%PYTHON%\\python.exe -m pip install -r requirements.txt"
   - "%PYTHON%\\python.exe -m pip install certifi PyInstaller"
   - nuget install secure-file -ExcludeVersion
-  - nuget install verpatch -ExcludeVersion
-  - secure-file\tools\secure-file -decrypt other\windows\Cert.pfx.enc -secret %ENCRYPTION%
   - secure-file\tools\secure-file -decrypt other\windows\sentry.py.enc -out kindlecomicconverter\sentry.py -secret %ENCRYPTION%
 
 build_script:
     - "%PYTHON%\\python.exe setup.py build_binary"
 
 after_build:
-  - ps: Get-ChildItem .\dist\KindleComicConverter_win_* | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
+  - ps: Get-ChildItem .\dist\KCC* | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
 
 deploy:
   provider: S3
diff --git a/other/windows/Cert.pfx.enc b/other/windows/Cert.pfx.enc
deleted file mode 100644
index 147cb9712169dabd0945156e64020debf3099d9e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3520
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

diff --git a/setup.bat b/setup.bat
deleted file mode 100644
index ac9de586..00000000
--- a/setup.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-@echo off
-verpatch\lib\win\verpatch dist\KCC.exe %1 /va /pv %1 /s product "Kindle Comic Converter" /s description "Kindle Comic Converter" /s copyright "Copyright (C) 2012-2017 Ciro Mattia Gonano and Pawel Jastrzebski"
-"C:\Program Files (x86)\Windows Kits\8.1\bin\x64\signtool.exe" sign /f "%APPVEYOR_BUILD_FOLDER%\other\windows\Cert.pfx" /p "%CERT_PASS%" /t http://time.certum.pl /d "Kindle Comic Converter" /du "http://kcc.iosphe.re/" dist/KCC.exe
-iscc /SSignTool="""C:\Program Files (x86)\Windows Kits\8.1\bin\x64\signtool.exe"" sign /f ""%APPVEYOR_BUILD_FOLDER%\other\windows\Cert.pfx"" /p ""%CERT_PASS%"" /t http://time.certum.pl $p" kcc.iss >nul 2>&1
diff --git a/setup.py b/setup.py
index c50dcaa0..50287049 100755
--- a/setup.py
+++ b/setup.py
@@ -47,10 +47,6 @@ def run(self):
             exit(0)
         elif sys.platform == 'win32':
             os.system('pyinstaller -y -F -i icons\comic2ebook.ico -n KCC -w --noupx kcc.py')
-            if os.getenv('APPVEYOR'):
-                if len(VERSION) == 3:
-                    VERSION = VERSION + '.0'
-                os.system('setup.bat ' + VERSION)
             exit(0)
         else:
             os.system('pyinstaller -y -F kcc.py')