From b3943b2f339eebc9bc06c4863910f52510186a04 Mon Sep 17 00:00:00 2001
From: pukkandan <pukkandan@gmail.com>
Date: Tue, 9 Feb 2021 17:35:12 +0530
Subject: [PATCH] [pyinst.py] Move back to root dir (Closes #63)

---
 .github/workflows/build.yml       |  4 ++--
 .gitignore                        |  1 +
 README.md                         |  2 +-
 devscripts/pyinst.py => pyinst.py | 13 ++++++-------
 4 files changed, 10 insertions(+), 10 deletions(-)
 rename devscripts/pyinst.py => pyinst.py (85%)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0deeb162b..7e215de6c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -91,7 +91,7 @@ jobs:
     - name: Print version
       run: echo "${{ steps.bump_version.outputs.ytdlc_version }}"
     - name: Run PyInstaller Script
-      run: python devscripts/pyinst.py 64
+      run: python pyinst.py 64
     - name: Upload youtube-dlc.exe Windows binary
       id: upload-release-windows
       uses: actions/upload-release-asset@v1
@@ -129,7 +129,7 @@ jobs:
     - name: Print version
       run: echo "${{ steps.bump_version.outputs.ytdlc_version }}"
     - name: Run PyInstaller Script for 32 Bit
-      run: python devscripts/pyinst.py 32
+      run: python pyinst.py 32
     - name: Upload Executable youtube-dlc_x86.exe
       id: upload-release-windows32
       uses: actions/upload-release-asset@v1
diff --git a/.gitignore b/.gitignore
index 73288053d..a550c83af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,7 @@ MANIFEST
 test/local_parameters.json
 .coverage
 cover/
+secrets/
 updates_key.pem
 *.egg-info
 .tox
diff --git a/README.md b/README.md
index 6f57325e0..1a5339160 100644
--- a/README.md
+++ b/README.md
@@ -106,7 +106,7 @@ To build the Windows executable, you must have pyinstaller (and optionally mutag
 
     python -m pip install --upgrade pyinstaller mutagen Crypto
 
-Once you have all the necessary dependancies installed, just run `py devscripts\pyinst.py`. The executable will be built for the same architecture (32/64 bit) as the python used to build it. It is strongly reccomended to use python3 although python2.6+ is supported.
+Once you have all the necessary dependancies installed, just run `py pyinst.py`. The executable will be built for the same architecture (32/64 bit) as the python used to build it. It is strongly reccomended to use python3 although python2.6+ is supported.
 
 You can also build the executable without any version info or metadata by using:
 
diff --git a/devscripts/pyinst.py b/pyinst.py
similarity index 85%
rename from devscripts/pyinst.py
rename to pyinst.py
index 083cec903..b6608de22 100644
--- a/devscripts/pyinst.py
+++ b/pyinst.py
@@ -3,7 +3,7 @@
 
 from __future__ import unicode_literals
 import sys
-import os
+# import os
 import platform
 
 from PyInstaller.utils.win32.versioninfo import (
@@ -18,11 +18,10 @@ print('Building %sbit version' % arch)
 _x86 = '_x86' if arch == '32' else ''
 
 FILE_DESCRIPTION = 'Media Downloader%s' % (' (32 Bit)' if _x86 else '')
-SHORT_URLS = {'32': 'git.io/JUGsM', '64': 'git.io/JLh7K'}
 
-root_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
-print('Changing working directory to %s' % root_dir)
-os.chdir(root_dir)
+# root_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
+# print('Changing working directory to %s' % root_dir)
+# os.chdir(root_dir)
 
 exec(compile(open('youtube_dlc/version.py').read(), 'youtube_dlc/version.py', 'exec'))
 VERSION = locals()['__version__']
@@ -49,7 +48,7 @@ VERSION_FILE = VSVersionInfo(
             StringTable(
                 '040904B0', [
                     StringStruct('Comments', 'Youtube-dlc%s Command Line Interface.' % _x86),
-                    StringStruct('CompanyName', 'pukkandan@gmail.com'),
+                    StringStruct('CompanyName', 'https://github.com/pukkandan/yt-dlp'),
                     StringStruct('FileDescription', FILE_DESCRIPTION),
                     StringStruct('FileVersion', VERSION),
                     StringStruct('InternalName', 'youtube-dlc%s' % _x86),
@@ -59,7 +58,7 @@ VERSION_FILE = VSVersionInfo(
                     ),
                     StringStruct('OriginalFilename', 'youtube-dlc%s.exe' % _x86),
                     StringStruct('ProductName', 'Youtube-dlc%s' % _x86),
-                    StringStruct('ProductVersion', '%s%s | %s' % (VERSION, _x86, SHORT_URLS[arch])),
+                    StringStruct('ProductVersion', '%s%s' % (VERSION, _x86)),
                 ])]),
         VarFileInfo([VarStruct('Translation', [0, 1200])])
     ]