From efe2113be9f10e1d109a60b057847e90151c78cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9ophile=20Bastian?= Date: Tue, 13 Dec 2016 16:03:10 +0100 Subject: [PATCH] Fix install script for old Python versions --- mkSymlink.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/mkSymlink.py b/mkSymlink.py index 55951af..0253fa5 100755 --- a/mkSymlink.py +++ b/mkSymlink.py @@ -7,27 +7,28 @@ BASE_DIRECTORY = 'files' HOME_DIRECTORY = os.getenv("HOME") -def recurseInstall(path='/'): +def recurseInstall(path=''): def homepath(entry): - return HOME_DIRECTORY + path + entry.name + return os.path.join(HOME_DIRECTORY, path, entry) def gitpath(entry): - return BASE_DIRECTORY + path + entry.name + return os.path.join(BASE_DIRECTORY, path, entry) def link(entry): - os.symlink(os.getcwd()+'/'+gitpath(entry), homepath(entry)) + os.symlink(os.path.join(os.getcwd(), gitpath(entry)), homepath(entry)) - for entry in os.scandir(BASE_DIRECTORY+path): + for entry in os.listdir(os.path.join(BASE_DIRECTORY, path)): if os.path.exists(homepath(entry)): # The file/directory already exists - if entry.is_dir(): # Directory: recurse on it - recurseInstall(path+entry.name+'/') + if os.path.isdir(entry): # Directory: recurse on it + recurseInstall(os.path.join(path, entry)) else: # File: backup it, symlink it os.rename(homepath(entry), homepath(entry)+'.bck') link(entry) else: link(entry) + if __name__ == '__main__': if not HOME_DIRECTORY: print("Couldn't find home directory.", file=sys.stderr)