protect against use with Python 2.x, use full absolute directory path internally
This commit is contained in:
@ -2,8 +2,13 @@
|
|||||||
# Utility for detecting incorrect LAMMPS homepage URLs
|
# Utility for detecting incorrect LAMMPS homepage URLs
|
||||||
#
|
#
|
||||||
# Written by Richard Berger (Temple University)
|
# Written by Richard Berger (Temple University)
|
||||||
import os
|
from __future__ import print_function
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
|
if sys.version_info.major < 3:
|
||||||
|
sys.exit('This script must be run with Python 3.x')
|
||||||
|
|
||||||
|
import os
|
||||||
import glob
|
import glob
|
||||||
import re
|
import re
|
||||||
import yaml
|
import yaml
|
||||||
@ -119,6 +124,7 @@ def main():
|
|||||||
parser.add_argument('-v', '--verbose', action='store_true', help='verbose output')
|
parser.add_argument('-v', '--verbose', action='store_true', help='verbose output')
|
||||||
parser.add_argument('DIRECTORY', help='directory (or file) that should be checked')
|
parser.add_argument('DIRECTORY', help='directory (or file) that should be checked')
|
||||||
args = parser.parse_args()
|
args = parser.parse_args()
|
||||||
|
lammpsdir = os.path.abspath(os.path.expanduser(args.DIRECTORY))
|
||||||
|
|
||||||
if args.config:
|
if args.config:
|
||||||
with open(args.config, 'r') as cfile:
|
with open(args.config, 'r') as cfile:
|
||||||
@ -126,12 +132,12 @@ def main():
|
|||||||
else:
|
else:
|
||||||
config = yaml.load(DEFAULT_CONFIG, Loader=yaml.FullLoader)
|
config = yaml.load(DEFAULT_CONFIG, Loader=yaml.FullLoader)
|
||||||
|
|
||||||
if os.path.isdir(args.DIRECTORY):
|
if os.path.isdir(lammpsdir):
|
||||||
if not check_folder(args.DIRECTORY, config, args.fix, args.verbose):
|
if not check_folder(lammpsdir, config, args.fix, args.verbose):
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
else:
|
else:
|
||||||
success = True
|
success = True
|
||||||
path = os.path.normpath(args.DIRECTORY)
|
path = os.path.normpath(lammpsdir)
|
||||||
|
|
||||||
if args.verbose:
|
if args.verbose:
|
||||||
print("Checking file:", path)
|
print("Checking file:", path)
|
||||||
|
|||||||
@ -2,8 +2,13 @@
|
|||||||
# Utility for detecting and fixing file permission issues in LAMMPS
|
# Utility for detecting and fixing file permission issues in LAMMPS
|
||||||
#
|
#
|
||||||
# Written by Richard Berger (Temple University)
|
# Written by Richard Berger (Temple University)
|
||||||
import os
|
from __future__ import print_function
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
|
if sys.version_info.major < 3:
|
||||||
|
sys.exit('This script must be run with Python 3.x')
|
||||||
|
|
||||||
|
import os
|
||||||
import glob
|
import glob
|
||||||
import yaml
|
import yaml
|
||||||
import argparse
|
import argparse
|
||||||
@ -82,6 +87,7 @@ def main():
|
|||||||
parser.add_argument('-v', '--verbose', action='store_true', help='verbose output')
|
parser.add_argument('-v', '--verbose', action='store_true', help='verbose output')
|
||||||
parser.add_argument('DIRECTORY', help='directory that should be checked')
|
parser.add_argument('DIRECTORY', help='directory that should be checked')
|
||||||
args = parser.parse_args()
|
args = parser.parse_args()
|
||||||
|
lammpsdir = os.path.abspath(os.path.expanduser(args.DIRECTORY))
|
||||||
|
|
||||||
if args.config:
|
if args.config:
|
||||||
with open(args.config, 'r') as cfile:
|
with open(args.config, 'r') as cfile:
|
||||||
@ -89,7 +95,7 @@ def main():
|
|||||||
else:
|
else:
|
||||||
config = yaml.load(DEFAULT_CONFIG, Loader=yaml.FullLoader)
|
config = yaml.load(DEFAULT_CONFIG, Loader=yaml.FullLoader)
|
||||||
|
|
||||||
if not check_folder(args.DIRECTORY, config, args.fix, args.verbose):
|
if not check_folder(lammpsdir, config, args.fix, args.verbose):
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
|
|||||||
@ -2,8 +2,13 @@
|
|||||||
# Utility for detecting and fixing whitespace issues in LAMMPS
|
# Utility for detecting and fixing whitespace issues in LAMMPS
|
||||||
#
|
#
|
||||||
# Written by Richard Berger (Temple University)
|
# Written by Richard Berger (Temple University)
|
||||||
import os
|
from __future__ import print_function
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
|
if sys.version_info.major < 3:
|
||||||
|
sys.exit('This script must be run with Python 3.x')
|
||||||
|
|
||||||
|
import os
|
||||||
import glob
|
import glob
|
||||||
import re
|
import re
|
||||||
import yaml
|
import yaml
|
||||||
@ -170,6 +175,7 @@ def main():
|
|||||||
parser.add_argument('-v', '--verbose', action='store_true', help='verbose output')
|
parser.add_argument('-v', '--verbose', action='store_true', help='verbose output')
|
||||||
parser.add_argument('DIRECTORY', help='directory that should be checked')
|
parser.add_argument('DIRECTORY', help='directory that should be checked')
|
||||||
args = parser.parse_args()
|
args = parser.parse_args()
|
||||||
|
lammpsdir = os.path.abspath(os.path.expanduser(args.DIRECTORY))
|
||||||
|
|
||||||
if args.config:
|
if args.config:
|
||||||
with open(args.config, 'r') as cfile:
|
with open(args.config, 'r') as cfile:
|
||||||
@ -177,7 +183,7 @@ def main():
|
|||||||
else:
|
else:
|
||||||
config = yaml.load(DEFAULT_CONFIG, Loader=yaml.FullLoader)
|
config = yaml.load(DEFAULT_CONFIG, Loader=yaml.FullLoader)
|
||||||
|
|
||||||
if not check_folder(args.DIRECTORY, config, args.fix, args.verbose):
|
if not check_folder(lammpsdir, config, args.fix, args.verbose):
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
|
|||||||
Reference in New Issue
Block a user