diff --git a/catfile.py b/catfile.py index 7418bd0..570df9e 100755 --- a/catfile.py +++ b/catfile.py @@ -14,7 +14,7 @@ Copyright 2018-2024 Game Maker 2k - http://intdb.sourceforge.net/ Copyright 2018-2024 Kazuki Przyborowski - https://github.com/KazukiPrzyborowski - $FileInfo: catfile.py - Last Update: 6/18/2024 Ver. 0.13.4 RC 1 - Author: cooldude2k $ + $FileInfo: catfile.py - Last Update: 6/18/2024 Ver. 0.13.6 RC 1 - Author: cooldude2k $ ''' from __future__ import absolute_import, division, print_function, unicode_literals; diff --git a/checksum.py b/checksum.py index 1fffb20..71bff88 100755 --- a/checksum.py +++ b/checksum.py @@ -14,7 +14,7 @@ Copyright 2018-2024 Game Maker 2k - http://intdb.sourceforge.net/ Copyright 2018-2024 Kazuki Przyborowski - https://github.com/KazukiPrzyborowski - $FileInfo: checksum.py - Last Update: 6/18/2024 Ver. 0.13.4 RC 1 - Author: cooldude2k $ + $FileInfo: checksum.py - Last Update: 6/18/2024 Ver. 0.13.6 RC 1 - Author: cooldude2k $ ''' from __future__ import absolute_import, division, print_function, unicode_literals; diff --git a/compression.py b/compression.py index 742a13a..c30d876 100755 --- a/compression.py +++ b/compression.py @@ -14,7 +14,7 @@ Copyright 2018-2024 Game Maker 2k - http://intdb.sourceforge.net/ Copyright 2018-2024 Kazuki Przyborowski - https://github.com/KazukiPrzyborowski - $FileInfo: compression.py - Last Update: 6/18/2024 Ver. 0.13.4 RC 1 - Author: cooldude2k $ + $FileInfo: compression.py - Last Update: 6/18/2024 Ver. 0.13.6 RC 1 - Author: cooldude2k $ ''' from __future__ import absolute_import, division, print_function, unicode_literals; diff --git a/mkcatfilebundle.py b/mkcatfilebundle.py index c997e54..69dac9a 100755 --- a/mkcatfilebundle.py +++ b/mkcatfilebundle.py @@ -14,7 +14,7 @@ Copyright 2018-2024 Game Maker 2k - http://intdb.sourceforge.net/ Copyright 2018-2024 Kazuki Przyborowski - https://github.com/KazukiPrzyborowski - $FileInfo: mkbundle.py - Last Update: 6/18/2024 Ver. 0.13.4 RC 1 - Author: cooldude2k $ + $FileInfo: mkbundle.py - Last Update: 6/18/2024 Ver. 0.13.6 RC 1 - Author: cooldude2k $ ''' import os, sys, shutil, subprocess, tempfile, subprocess, platform; diff --git a/neocatfile.py b/neocatfile.py index ab49b50..6f6615f 100755 --- a/neocatfile.py +++ b/neocatfile.py @@ -14,7 +14,7 @@ Copyright 2018-2024 Game Maker 2k - http://intdb.sourceforge.net/ Copyright 2018-2024 Kazuki Przyborowski - https://github.com/KazukiPrzyborowski - $FileInfo: neocatfile.py - Last Update: 6/18/2024 Ver. 0.13.4 RC 1 - Author: cooldude2k $ + $FileInfo: neocatfile.py - Last Update: 6/18/2024 Ver. 0.13.6 RC 1 - Author: cooldude2k $ ''' from __future__ import absolute_import, division, print_function, unicode_literals diff --git a/phpcatfile.php b/phpcatfile.php index c5c46d8..f8e9d6b 100755 --- a/phpcatfile.php +++ b/phpcatfile.php @@ -12,7 +12,7 @@ Copyright 2018-2024 Game Maker 2k - http://intdb.sourceforge.net/ Copyright 2018-2024 Kazuki Przyborowski - https://github.com/KazukiPrzyborowski - $FileInfo: phpcatfile.php - Last Update: 6/18/2024 Ver. 0.13.4 RC 1 - Author: cooldude2k $ + $FileInfo: phpcatfile.php - Last Update: 6/18/2024 Ver. 0.13.6 RC 1 - Author: cooldude2k $ */ date_default_timezone_set('UTC'); @@ -20,7 +20,7 @@ $info['program_name'] = "PHPCatFile"; $info['project'] = $info['program_name']; $info['project_url'] = "https://github.com/GameMaker2k/PyCatFile"; -$info['version_info'] = [0, 13, 4, "RC 1", 1]; +$info['version_info'] = [0, 13, 6, "RC 1", 1]; $info['version_id'] = "$Id$"; $info['version_date_info'] = [2024, 6, 18, "RC 1", 1]; $info['version_date'] = $info['version_date_info'][0].".".str_pad($info['version_date_info'][1], 2, "-=", STR_PAD_LEFT).".".str_pad($info['version_date_info'][2], 2, "-=", STR_PAD_LEFT); diff --git a/pycatfile.py b/pycatfile.py index 0c3bc3a..e5caffc 100755 --- a/pycatfile.py +++ b/pycatfile.py @@ -14,7 +14,7 @@ Copyright 2018-2024 Game Maker 2k - http://intdb.sourceforge.net/ Copyright 2018-2024 Kazuki Przyborowski - https://github.com/KazukiPrzyborowski - $FileInfo: pycatfile.py - Last Update: 6/18/2024 Ver. 0.13.4 RC 1 - Author: cooldude2k $ + $FileInfo: pycatfile.py - Last Update: 6/18/2024 Ver. 0.13.6 RC 1 - Author: cooldude2k $ ''' from __future__ import absolute_import, division, print_function, unicode_literals; @@ -175,9 +175,9 @@ if(not havepysftp): __use_pysftp__ = False; __use_http_lib__ = "httpx"; -if(__use_http_lib__=="httpx" haverequests and not havehttpx): +if(__use_http_lib__=="httpx" and haverequests and not havehttpx): __use_http_lib__ = "requests"; -if(__use_http_lib__=="requests" havehttpx and not haverequests): +if(__use_http_lib__=="requests" and havehttpx and not haverequests): __use_http_lib__ = "httpx"; if((__use_http_lib__=="httpx" or __use_http_lib__=="requests") and not havehttpx and not haverequests): __use_http_lib__ = "urllib"; @@ -213,7 +213,7 @@ __file_format_dict__ = {'format_name': __file_format_name__, 'format_magic': __file_format_magic__, 'format_lower': __file_format_lower__, 'format_len': __file_format_len__, 'format_hex': __file_format_hex__, 'format_delimiter': __file_format_delimiter__, 'format_ver': __file_format_ver__, 'new_style': __use_new_style__, 'use_advanced_list': __use_advanced_list__, 'use_alt_inode': __use_alt_inode__}; __project__ = __program_name__; __project_url__ = "https://github.com/GameMaker2k/PyCatFile"; -__version_info__ = (0, 13, 4, "RC 1", 1); +__version_info__ = (0, 13, 6, "RC 1", 1); __version_date_info__ = (2024, 6, 18, "RC 1", 1); __version_date__ = str(__version_date_info__[0]) + "." + str(__version_date_info__[1]).zfill(2) + "." + str(__version_date_info__[2]).zfill(2); __revision__ = __version_info__[3]; diff --git a/pyshell-old.py b/pyshell-old.py index 54ec98e..91bf619 100755 --- a/pyshell-old.py +++ b/pyshell-old.py @@ -13,7 +13,7 @@ Copyright 2018-2024 Game Maker 2k - http://intdb.sourceforge.net/ Copyright 2018-2024 Kazuki Przyborowski - https://github.com/KazukiPrzyborowski - $FileInfo: pyshell-old.py - Last Update: 6/18/2024 Ver. 0.13.4 RC 1 - Author: cooldude2k $ + $FileInfo: pyshell-old.py - Last Update: 6/18/2024 Ver. 0.13.6 RC 1 - Author: cooldude2k $ ''' from __future__ import print_function diff --git a/pyshell.py b/pyshell.py index 36b2783..9bb38e2 100755 --- a/pyshell.py +++ b/pyshell.py @@ -13,7 +13,7 @@ Copyright 2018-2024 Game Maker 2k - http://intdb.sourceforge.net/ Copyright 2018-2024 Kazuki Przyborowski - https://github.com/KazukiPrzyborowski - $FileInfo: pyshell.py - Last Update: 6/18/2024 Ver. 0.13.4 RC 1 - Author: cooldude2k $ + $FileInfo: pyshell.py - Last Update: 6/18/2024 Ver. 0.13.6 RC 1 - Author: cooldude2k $ ''' from __future__ import division, absolute_import, print_function; diff --git a/setup.py b/setup.py index ca7324f..6c5c1fc 100755 --- a/setup.py +++ b/setup.py @@ -13,7 +13,7 @@ Copyright 2016-2024 Game Maker 2k - http://intdb.sourceforge.net/ Copyright 2016-2024 Kazuki Przyborowski - https://github.com/KazukiPrzyborowski - $FileInfo: setup.py - Last Update: 6/18/2024 Ver. 0.13.4 RC 1 - Author: cooldude2k $ + $FileInfo: setup.py - Last Update: 6/18/2024 Ver. 0.13.6 RC 1 - Author: cooldude2k $ ''' import os, re, sys, pkg_resources;