From 3cdd882b45055b33135187ee97762978745a0650 Mon Sep 17 00:00:00 2001 From: phixxy Date: Thu, 5 Mar 2026 00:24:40 -0800 Subject: [PATCH] cleanup code, use safer path concat --- skratch.py | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/skratch.py b/skratch.py index 2c436b7..5011449 100755 --- a/skratch.py +++ b/skratch.py @@ -51,16 +51,16 @@ def mkstemp(fp): def run(editor, sk_path, filename=None): if not filename: filename = "skratch-XXXXXX" - fp = sk_path + filename + fp = os.path.join(sk_path, filename) fp = mkstemp(fp) else: - fp = sk_path + filename + fp = os.path.join(sk_path, filename) if fp != None: os.execvp(editor, [editor,fp]) def main(): home_path = os.getenv("HOME") - sk_path = home_path + "/.skratch/" + sk_path = os.path.join(home_path, ".skratch") make_dir(sk_path) parser = argparse.ArgumentParser( @@ -78,11 +78,6 @@ def main(): help="list files", action="store_true") - group.add_argument( - "-n", - help="new file", - action="store_const") - group.add_argument( "-o", help="open file", @@ -96,16 +91,12 @@ def main(): args = parser.parse_args() filename = "skratch-XXXXXX" - home_path = os.getenv("HOME") - sk_path = home_path + "/.skratch/" editor = get_editor(args.v) - if args.n: run(editor,sk_path,args.n) - elif args.o: run(editor,sk_path,args.o) + if args.o: run(editor,sk_path,args.o) elif args.c: delete_all(sk_path) elif args.l: list_all(sk_path) - else: - run(editor,sk_path) + else: run(editor,sk_path) main()