From 22afb563e3f6b248c8d535ef60e67efefd88200b Mon Sep 17 00:00:00 2001 From: Simone Margaritelli Date: Fri, 25 Oct 2019 16:01:53 +0200 Subject: [PATCH] misc: small fix or general refactoring i did not bother commenting --- pwnagotchi/utils.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pwnagotchi/utils.py b/pwnagotchi/utils.py index cb9d2ae7..392d2fd7 100644 --- a/pwnagotchi/utils.py +++ b/pwnagotchi/utils.py @@ -36,13 +36,15 @@ def load_config(args): # logging not configured here yet print("installing /boot/config.yml to %s ...", args.user_config) # https://stackoverflow.com/questions/42392600/oserror-errno-18-invalid-cross-device-link - shutil.rmtree('/etc/pwnagotchi', ignore_errors=True) - shutil.move('/boot/pwnagotchi', '/etc/', args.user_config) + shutil.move("/boot/config.yml", args.user_config) + # check for an entire pwnagotchi folder on /boot/ if os.path.isdir('/boot/pwnagotchi'): print("installing /boot/pwnagotchi to /etc/pwnagotchi ...") + shutil.rmtree('/etc/pwnagotchi', ignore_errors=True) + shutil.move('/boot/pwnagotchi', '/etc/') - # if no config is found, copy the defaults + # if not config is found, copy the defaults if not os.path.exists(args.config): print("copying %s to %s ..." % (ref_defaults_file, args.config)) shutil.copy(ref_defaults_file, args.config)