Compare commits
2 Commits
4c9c879a26
...
a3b0a86447
Author | SHA1 | Date |
---|---|---|
Gilles Grandou | a3b0a86447 | |
Gilles Grandou | 13130bbbe6 |
|
@ -54,10 +54,11 @@ def load_config(conf_name, osname):
|
|||
}
|
||||
conf = read_yaml(conf_name)
|
||||
osconf = conf.get(osname)
|
||||
osconf['stamp'] = conf.get('stamp')
|
||||
if not osconf:
|
||||
print(f"ERROR: cannot find configuration for distribution {osname}")
|
||||
sys.exit(1)
|
||||
|
||||
osconf['stamp'] = conf.get('stamp')
|
||||
osconf['osname'] = osname
|
||||
for k in [ 'dockerfile', 'packages', 'environment', 'binds' ]:
|
||||
if osconf.get(k):
|
||||
|
|
|
@ -7,6 +7,7 @@ configdir=~/.config/runon
|
|||
|
||||
if [ -e $venvdir/bin/runon ]; then
|
||||
echo "remove links from $bindir"
|
||||
find -L $bindir -samefile $bindir/runon -exec rm -v {} \;
|
||||
find -L $bindir -samefile $venvdir/bin/runon -exec rm -v {} \;
|
||||
fi
|
||||
|
||||
|
@ -18,5 +19,7 @@ fi
|
|||
if [ -e $configdir ]; then
|
||||
echo "remove configs"
|
||||
rm -vf $configdir/runon.default.yaml
|
||||
rmdir --ignore-fail-on-non-empty -v $configdir
|
||||
rmdir -v $configdir || true
|
||||
fi
|
||||
|
||||
echo "done."
|
||||
|
|
Loading…
Reference in New Issue