From a6e3aa258c5e7883b833cd79f1addeee3994fac0 Mon Sep 17 00:00:00 2001 From: e-carlin Date: Thu, 18 Jan 2024 20:39:54 +0000 Subject: [PATCH] pr comments --- rsconf/db.py | 2 +- rsconf/package_data/vm_devbox/start.sh.jinja | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/rsconf/db.py b/rsconf/db.py index 6b467364..98d28a82 100644 --- a/rsconf/db.py +++ b/rsconf/db.py @@ -99,7 +99,7 @@ def _host_db_fconf(self, channel, host): host_run_d="/srv", run_u="vagrant", root_u="root", - installers_url="https://radia.run", + installer_url="https://radia.run", ).pkupdate(c) ), ) diff --git a/rsconf/package_data/vm_devbox/start.sh.jinja b/rsconf/package_data/vm_devbox/start.sh.jinja index a5292cb9..8e23b432 100644 --- a/rsconf/package_data/vm_devbox/start.sh.jinja +++ b/rsconf/package_data/vm_devbox/start.sh.jinja @@ -5,7 +5,7 @@ vm_devbox_first_start() { if [[ -e Vagrantfile ]]; then return fi - curl '{{ rsconf_db.installers_url }}' | vagrant_dev_vm_devbox=1 bash -s vagrant-sirepo-dev '{{ this.vm_hostname}}' + curl '{{ rsconf_db.installer_url }}' | vagrant_dev_vm_devbox=1 bash -s vagrant-sirepo-dev '{{ this.vm_hostname}}' } vm_devbox_set_forwarded_port() { @@ -21,7 +21,7 @@ _FORWARDED_PORT_FULL = ( ) ) r = False -with open(_FILE, "r+") as f: +with open(_FILE) as f: c = f.read() if _FORWARDED_PORT_PREAMBLE not in c: c = re.sub( @@ -39,9 +39,8 @@ with open(_FILE, "r+") as f: flags=re.MULTILINE, ) r = True - f.seek(0) +with open(_FILE, 'w') as f: f.write(c) - f.truncate() if r: subprocess.check_call(("vagrant", "reload")) EOF