From a74de86df841b4e2f9476bb6a9da01574e1e4952 Mon Sep 17 00:00:00 2001 From: Oliver Hamlet Date: Wed, 19 Aug 2015 20:18:53 +0100 Subject: [PATCH] Remove archiver GitHub desktop client usage. Only support using the Git for Windows install, since it's necessary to have revision IDs stored in the binaries. Also updated the link to Git for Windows. --- CMakeLists.txt | 3 +-- README.md | 2 +- src/archive.py | 11 +---------- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7704e95c..89ca725c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,8 +8,7 @@ ############################## # Uses the CMake module in this repo: https://github.com/rpavlik/cmake-modules -# On Windows, this requires the msysgit install of Git, as the script won't find -# the one bundled with GitHub for Windows. +# On Windows, this requires Git for Windows to be installed. list(APPEND CMAKE_MODULE_PATH ${CMAKE_BINARY_DIR}) include(GetGitRevisionDescription OPTIONAL RESULT_VARIABLE GIT_MODULE_PATH) diff --git a/README.md b/README.md index d36f7ae8..ffa232af 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ Installer and zip archive releases for the main LOOT application can be handled If the unofficial Korean and Simplified Chinese Inno Setup translation files are installed alongside the official translation files, then the installer script will also offer those language options. If they are not found, the installer will be built without them. -If you have [Git for Windows (msysGit)](https://msysgit.github.io/) or [GitHub for Windows](https://windows.github.com/) installed and you're building from a clone of this repository, the archive script will give archives descriptive names using the output of `git describe --tags --long`. If you have [7-Zip](http://7-zip.org) installed, `.7z` archives will be created. Otherwise, archives will be named `LOOT Archive` and created as deflate-compressed zip files. +If you have [Git for Windows](http://git-for-windows.github.io/) installed and you're building from a clone of this repository, the archive script will give archives descriptive names using the output of `git describe --tags --long`. If you have [7-Zip](http://7-zip.org) installed, `.7z` archives will be created. Otherwise, archives will be named `LOOT Archive` and created as deflate-compressed zip files. ## Snapshot Builds diff --git a/src/archive.py b/src/archive.py index 21574f1f..502c9122 100644 --- a/src/archive.py +++ b/src/archive.py @@ -67,16 +67,7 @@ def which(cmd): exe_path = p if not exe_path: - # Now look in likely paths, depending on what cmd is. - if cmd == 'git.exe': - # Git wasn't found in PATH, do a search (in GitHub install location). - github = os.path.join( os.getenv('LOCALAPPDATA'), 'GitHub' ) - for folder, subdirs, files in os.walk(github): - for subdir in subdirs: - # Check for a \\cmd\git.exe - if os.path.exists( os.path.join( folder, subdir, 'cmd', 'git.exe') ): - exe_path = os.path.join( folder, subdir, 'cmd', 'git.exe') - elif cmd == '7z.exe': + if cmd == '7z.exe': sevenzip_path = os.path.join('C:\\', 'Program Files', '7-Zip', '7z.exe') if os.path.exists(sevenzip_path): exe_path = sevenzip_path