Browse Source

symlink enhancements

* runon -l now install symlink
* install -u now removes all found symlinks to runon
master
Gilles Grandou 1 year ago
parent
commit
8b08aab4e7
  1. 3
      README.md
  2. 7
      install
  3. 14
      runon

3
README.md

@ -78,8 +78,7 @@ simply pass `-u` to install command you have used, eg.:
you can create soft links to `runos` to simplify calls:
cd /usr/local/bin
ln -s runon centos7
runos centos7 -l
now calling `centos7 ...` is equivalent to call `runos centos7 ...`:

7
install

@ -89,6 +89,13 @@ elif [ "$op" = "installdev" ]; then
do_exec ln -s -f $(realpath runon) $bin_dir/
do_exec ln -s -f $(realpath runon.conf) $config_dir/
elif [ "$op" = "uninstall" ]; then
# find all symlinks targetting to runon, and remove them
find $bin_dir -type l | while read l; do
if [ "$(readlink $l)" = "runon" ]; then
do_exec rm $l
fi
done
do_exec rm -f $bin_dir/runon
do_exec rm -f $config_dir/runon.conf
test -d $bin_dir && do_exec rmdir --parents --ignore-fail-on-non-empty $bin_dir 2> /dev/null

14
runon

@ -56,6 +56,13 @@ def load_config(user_confname, osname):
return conf
def make_osname_link(binpath, osname):
link = os.path.join(os.path.dirname(binpath), osname)
try:
os.symlink('runon', link)
except FileExistsError:
pass
def make_image_name(osname):
user = getpass.getuser()
name = 'runon-{}-{}'.format(osname, user)
@ -175,6 +182,8 @@ def main():
help='specify config file')
parser.add_argument('-u', '--update', action='store_true',
help='force image update')
parser.add_argument('-l', '--link', action='store_true',
help='create a symlink to call "osname" as a shortcut to "runon osname"')
parser.add_argument('command', nargs='*', default=None,
help = 'command to execute')
@ -188,10 +197,15 @@ def main():
for o in sorted(osnames, key=natural_sortkey):
print(' {}'.format(o))
print()
if args.link:
for o in osnames:
make_osname_link(sys.argv[0], args.osname)
return 0
client = docker.from_env()
conf = load_config(args.config, args.osname)
if args.link:
make_osname_link(sys.argv[0], args.osname)
image = build_image(client, conf, args.update, args.verbose)
container = create_container(client, image, conf, args.command, args.verbose)
ret = run_container(client, container)

Loading…
Cancel
Save