scout-gear 8.1.0 → 9.0.0

data/lib/scout/workflow/step/status.rb

@@ -1,6 +1,6 @@
 class Step
   def abort(exception = nil)
-    if info[:pid] != Process.pid && Misc.alive?(pid)
+    if (pid = info[:pid]) && pid != Process.pid && Misc.pid_alive?(pid)
       Process.kill pid
     else
       while @result && streaming? && stream = self.stream
@@ -15,7 +15,7 @@ class Step
 
   def updated?
     return false if self.error? && self.recoverable_error?
-    return true unless ENV["SCOUT_UPDATE"]
+    return true if self.done? && ! ENV["SCOUT_UPDATE"]
     newer = rec_dependencies.select{|dep| Path.newer?(self.path, dep.path) }
     newer += input_dependencies.select{|dep| Path.newer?(self.path, dep.path) }
 
@@ -28,6 +28,7 @@ class Step
     @info = nil
     @info_load_time = nil
     Open.rm path if Open.exist?(path)
+    Open.rm tmp_path if Open.exist?(tmp_path)
     Open.rm info_file if Open.exist?(info_file)
     Open.rm_rf files_dir if Open.exist?(files_dir)
   end
@@ -40,4 +41,23 @@ class Step
     clean
   end
 
+  def canfail?
+    @compute && @compute.include?(:canfail)
+  end
+
+  def started?
+    return true if done?
+    return false unless Open.exist?(info_file)
+    pid = info[:pid]
+    return false unless pid
+    return Misc.pid_alive?(pid)
+  end
+
+  def waiting?
+    present? and not started?
+  end
+
+  def dirty?
+    done? && ! updated?
+  end
 end

data/lib/scout/workflow/step.rb

@@ -8,16 +8,18 @@ require_relative 'step/dependencies'
 require_relative 'step/provenance'
 require_relative 'step/config'
 require_relative 'step/progress'
+require_relative 'step/inputs'
 
 class Step 
 
-  attr_accessor :path, :inputs, :dependencies, :id, :task, :tee_copies, :non_default_inputs, :compute
-  def initialize(path = nil, inputs = nil, dependencies = nil, id = nil, non_default_inputs = nil, compute = nil, &task) 
+  attr_accessor :path, :inputs, :dependencies, :id, :task, :tee_copies, :non_default_inputs, :provided_inputs, :compute, :overriden_task, :overriden_workflow
+  def initialize(path = nil, inputs = nil, dependencies = nil, id = nil, non_default_inputs = nil, provided_inputs = nil, compute = nil, &task)
     @path = path
     @inputs = inputs
     @dependencies = dependencies
     @id = id
     @non_default_inputs = non_default_inputs
+    @provided_inputs = provided_inputs
     @compute = compute 
     @task = task
     @mutex = Mutex.new
@@ -209,7 +211,7 @@ class Step
     if done?
       Open.open(self.path)
     else
-      if running?
+      if running? || waiting?
         join
         Open.open(self.path)
       else
@@ -251,7 +253,7 @@ class Step
 
   def join
     consume_all_streams
-    while @result.nil? && (present? && ! terminated?)
+    while @result.nil? && (present? && ! (terminated? || done?))
       sleep 0.1
     end
     raise self.exception if self.exception
@@ -278,6 +280,7 @@ class Step
   def step(task_name)
     dependencies.each do |dep|
       return dep if dep.task_name == task_name
+      return dep if dep.overriden_task == task_name
       rec_dep = dep.step(task_name)
       return rec_dep if rec_dep
     end
@@ -295,4 +298,8 @@ class Step
   def fingerprint
     digest_str
   end
+
+  def task_signature
+    [workflow.to_s, task_name] * "#"
+  end
 end

data/lib/scout/workflow/task/dependencies.rb

@@ -55,6 +55,8 @@ module Task
         dep = provided_inputs[overriden]
         dep = Step.new dep unless Step === dep
         dep.type = workflow.tasks[task].type
+        dep.overriden_task = task
+        dep.overriden_workflow = workflow
         dependencies << dep
         non_default_inputs << overriden
         next

data/lib/scout/workflow/task/inputs.rb

@@ -20,7 +20,7 @@ module Task
     end
   end
 
-  def assign_inputs(provided_inputs = {})
+  def assign_inputs(provided_inputs = {}, id = nil)
     if self.inputs.nil? || (self.inputs.empty? && Array === provided_inputs)
       case provided_inputs
       when Array
@@ -43,6 +43,8 @@ module Task
       if ! provided.nil? && provided != value
         non_default_inputs << name.to_sym
         input_array << provided
+      elsif options && options[:jobname]
+        input_array << id
       else
         input_array << value
       end
@@ -53,13 +55,14 @@ module Task
     [input_array, non_default_inputs]
   end
 
-  def process_inputs(provided_inputs = {})
-    input_array, non_default_inputs = assign_inputs provided_inputs
+  def process_inputs(provided_inputs = {}, id = nil)
+    input_array, non_default_inputs = assign_inputs provided_inputs, id
     digest_str = Misc.digest_str(input_array)
     [input_array, non_default_inputs, digest_str]
   end
 
   def save_file_input(orig_file, directory)
+    orig_file = orig_file.path if Step === orig_file
     basename = File.basename(orig_file)
     digest = Misc.digest(orig_file)
     if basename.include? '.'
@@ -81,7 +84,10 @@ module Task
       value = provided_inputs[name]
       input_file = File.join(directory, name.to_s)
 
-      if type == :file
+      if Path.is_filename?(value) 
+        relative_file = save_file_input(value, directory)
+        Open.write(input_file + ".as_file", relative_file)
+      elsif type == :file
         relative_file = save_file_input(value, directory)
         Persist.save(relative_file, input_file, :file)
       elsif type == :file_array
@@ -89,13 +95,10 @@ module Task
           save_file_input(orig_file, directory)
         end
         Persist.save(new_files, input_file, type)
-      elsif Path.is_filename?(value) 
-        relative_file = save_file_input(value, directory)
-        Open.write(input_file + ".as_file", relative_file)
       elsif Open.is_stream?(value)
-        Persist.save(input_file, value, type)
+        Persist.save(value, input_file, type)
       elsif Open.has_stream?(value)
-        Persist.save(input_file, value.stream, type)
+        Persist.save(value.stream, input_file, type)
       else
         Persist.save(value, input_file, type)
       end
@@ -112,6 +115,8 @@ module Task
           value = Open.read(filename).strip
           value.sub!(/^\./, File.dirname(filename)) if value.start_with?("./")
           inputs[name] = value
+        elsif (options &&  (options[:noload] || options[:stream] || options[:nofile]))
+          inputs[name] = filename
         else
           inputs[name] = Persist.load(filename, type)
         end

data/lib/scout/workflow/task.rb

@@ -42,11 +42,12 @@ module Task
   def job(id = DEFAULT_NAME, provided_inputs = nil )
     provided_inputs, id = id, DEFAULT_NAME if (provided_inputs.nil? || provided_inputs.empty?) && (Hash === id || Array === id)
     provided_inputs = {} if provided_inputs.nil?
+    IndiferentHash.setup(provided_inputs)
     id = DEFAULT_NAME if id.nil?
 
     provided_inputs = load_inputs(provided_inputs[:load_inputs]) if Hash === provided_inputs && provided_inputs[:load_inputs]
 
-    inputs, non_default_inputs, input_digest_str = process_inputs provided_inputs
+    inputs, non_default_inputs, input_digest_str = process_inputs provided_inputs, id
 
     compute = {}
     dependencies = dependencies(id, provided_inputs, non_default_inputs, compute)
@@ -90,7 +91,8 @@ module Task
         Log.debug "ID #{self.name} #{id} - Clean"
       end
       NamedArray.setup(inputs, @inputs.collect{|i| i[0] }) if @inputs
-      Step.new path.find, inputs, dependencies, id, non_default_inputs, compute, &self
+      step_provided_inputs = Hash === provided_inputs ? provided_inputs.slice(*non_default_inputs) : provided_inputs
+      Step.new path.find, inputs, dependencies, id, non_default_inputs, step_provided_inputs, compute, &self
     end
   end
 end

data/lib/scout/workflow/usage.rb

@@ -13,28 +13,30 @@ module Task
         if paragraph
           str.puts "\n" << Misc.format_paragraph(paragraph) 
         end
-        str.puts
       else
         title = self.name.to_s
         str.puts Log.color :yellow, title
         str.puts Log.color :yellow, "-" * title.length
         str.puts "\n" << Misc.format_paragraph(description) 
-        str.puts
       end
     else
       title = self.name.to_s
       str.puts Log.color :yellow, title
       str.puts Log.color :yellow, "-" * title.length
-      str.puts
     end
 
 
     selects = []
+
     if inputs && inputs.any?
+      str.puts
       str.puts Log.color(:magenta, "Inputs")
       str.puts
       str.puts SOPT.input_array_doc(inputs)
-      str.puts
+
+      inputs.select{|name,type, _| type == :select }.each do |name,_,_,_,options|
+        selects << [name, options[:select_options]] if options[:select_options]
+      end
     end
 
     deps = workflow ? workflow.recursive_deps(self.name) : self.deps if deps.nil?
@@ -44,14 +46,21 @@ module Task
       deps.each do |dep_workflow,task_name,options|
         next if task_name.nil?
         task = dep_workflow.tasks[task_name]
+
         next if task.inputs.nil?
+
         inputs = task.inputs.reject{|name, _| seen.include? name }
         inputs = task.inputs.reject{|name, _| options.include? name }
         next unless inputs.any?
+        task.inputs.select{|name, _| inputs.include? name }.each do |name,_,_,_,options|
+          selects << [i, options[:select_options]] if options[:select_options]
+        end
+
         dep = workflow.nil? || dep_workflow.name != workflow.name ? ["#{dep_workflow.name}", task_name.to_s] *"#" : task_name.to_s
         dep_inputs[dep] = inputs
       end
 
+      str.puts
       str.puts Log.color(:magenta, "Inputs from dependencies:") if dep_inputs.any?
       dep_inputs.each do |dep,inputs|
         str.puts
@@ -59,54 +68,31 @@ module Task
         str.puts
         str.puts SOPT.input_array_doc(inputs)
       end
-
-      #task_inputs = dep_inputs deps, workflow
-      #task_inputs.each do |task,new_inputs|
-      #  new_inputs.zip(task.input_types.values_at(*new_inputs)).select do |i,t| 
-      #    t.to_sym == :select and task.input_options[i][:select_options] 
-      #  end.each do |i,t| 
-      #    selects << [i, task.input_options[i][:select_options]] 
-      #  end
-
-      #  next if new_inputs.empty?
-
-      #  if task.workflow and task.workflow != workflow
-      #    puts "  #{Log.color :yellow, ["[#{task.workflow.to_s}]", task.name.to_s] *" "}:"
-      #  else
-      #    puts "  #{Log.color :yellow, task.name.to_s}:"
-      #  end
-      #  puts unless Log.compact
-      #  puts SOPT.input_doc(new_inputs, task.input_types, task.input_descriptions, task.input_defaults, true)
-      #  puts unless Log.compact
-      #end
-      #puts
     end
 
     case
     when inputs && inputs.select{|name,type| type == :array }.any?
+      str.puts
       str.puts Log.color(:green, Misc.format_paragraph("Lists are specified as arguments using ',' or '|'. When specified as files the '\\n'
       also works in addition to the others. You may use the '--array_separator' option
       the change this default. Whenever a file is specified it may also accept STDIN using
       the '-' character."))
-      str.puts
 
     when inputs && inputs.select{|name,type| type == :file || type == :tsv }.any?
-      str.puts Log.color(:green, Misc.format_paragraph("Whenever a file is specified it may also accept STDIN using the '-' character."))
       str.puts
+      str.puts Log.color(:green, Misc.format_paragraph("Whenever a file is specified it may also accept STDIN using the '-' character."))
     end
 
     str.puts
     str.puts Log.color(:magenta, "Returns: ") << Log.color(:blue, type.to_s) << "\n"
-    str.puts
 
     if selects.any?
-      str.puts Log.color(:magenta, "Input select options")
       str.puts
+      str.puts Log.color(:magenta, "Input select options")
       selects.collect{|p| p}.uniq.each do |input,options|
+        str.puts 
         str.puts Log.color(:blue, input.to_s + ": ") << Misc.format_paragraph(options.collect{|o| Array === o ? o.first.to_s : o.to_s} * ", ") << "\n"
-        str.puts unless Log.compact
       end
-      str.puts
     end
     str.rewind
     str.read
@@ -249,7 +235,9 @@ module Workflow
 
     str.puts
 
-    if task.nil?
+    if tasks.nil?
+      str.puts Log.color(:title, "No tasks")
+    elsif task.nil?
 
       if self.documentation[:description] and not self.documentation[:description].empty?
         str.puts Misc.format_paragraph self.documentation[:description] 
@@ -284,7 +272,7 @@ module Workflow
 
         prov_string = prov_string(dep_tree(name))
         str.puts Misc.format_paragraph Log.color(:blue, "->" + prov_string) if prov_string && ! prov_string.empty?
-      end
+      end 
 
     else
 

data/lib/scout/workflow.rb

@@ -25,20 +25,24 @@ module Workflow
     base.libdir = Path.setup(libdir).tap{|p| p.resource = base}
   end
 
-  def self.require_workflow(workflow_name)
-    workflow = workflow_name 
-    workflow = Path.setup('workflows')[workflow_name]["workflow.rb"] unless Open.exists?(workflow)
-    workflow = Path.setup('workflows')[Misc.snake_case(workflow_name)]["workflow.rb"] unless Open.exists?(workflow)
-    workflow = Path.setup('workflows')[Misc.camel_case(workflow_name)]["workflow.rb"] unless Open.exists?(workflow)
-    if Open.exists?(workflow)
-      self.main = nil
-      workflow = workflow.find if Path === workflow
-      $LOAD_PATH.unshift(File.join(File.dirname(workflow), 'lib'))
-      load workflow
-    else
-      raise "Workflow #{workflow_name} not found"
+  def self.require_workflow(workflow_name_orig)
+    first = nil
+    workflow_name_orig.split("+").each do |workflow_name|
+      workflow = workflow_name
+      workflow = Path.setup('workflows')[workflow_name]["workflow.rb"] unless Open.exists?(workflow)
+      workflow = Path.setup('workflows')[Misc.snake_case(workflow_name)]["workflow.rb"] unless Open.exists?(workflow)
+      workflow = Path.setup('workflows')[Misc.camel_case(workflow_name)]["workflow.rb"] unless Open.exists?(workflow)
+      if Open.exists?(workflow)
+        self.main = nil
+        workflow = workflow.find if Path === workflow
+        $LOAD_PATH.unshift(File.join(File.dirname(workflow), 'lib'))
+        load workflow
+      else
+        raise "Workflow #{workflow_name} not found"
+      end
+      first ||= self.main || workflows.last
     end
-    self.main || workflows.last
+    first
   end
 
   def job(name, *args)

data/scout-gear.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: scout-gear 8.1.0 ruby lib
+# stub: scout-gear 9.0.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "scout-gear".freeze
-  s.version = "8.1.0"
+  s.version = "9.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Miguel Vazquez".freeze]
-  s.date = "2023-06-15"
+  s.date = "2023-06-27"
   s.description = "Temporary files, logs, path, resources, persistence, workflows, TSV, etc.".freeze
   s.email = "mikisvaz@gmail.com".freeze
   s.executables = ["scout".freeze]
@@ -77,6 +77,7 @@ Gem::Specification.new do |s|
     "lib/scout/persist/path.rb",
     "lib/scout/persist/serialize.rb",
     "lib/scout/resource.rb",
+    "lib/scout/resource/open.rb",
     "lib/scout/resource/path.rb",
     "lib/scout/resource/produce.rb",
     "lib/scout/resource/produce/rake.rb",
@@ -126,6 +127,7 @@ Gem::Specification.new do |s|
     "lib/scout/workflow/step/dependencies.rb",
     "lib/scout/workflow/step/file.rb",
     "lib/scout/workflow/step/info.rb",
+    "lib/scout/workflow/step/inputs.rb",
     "lib/scout/workflow/step/load.rb",
     "lib/scout/workflow/step/progress.rb",
     "lib/scout/workflow/step/provenance.rb",
@@ -143,6 +145,8 @@ Gem::Specification.new do |s|
     "scout_commands/glob",
     "scout_commands/offsite",
     "scout_commands/rbbt",
+    "scout_commands/resource/produce",
+    "scout_commands/template",
     "scout_commands/update",
     "scout_commands/workflow/info",
     "scout_commands/workflow/install",
@@ -151,6 +155,8 @@ Gem::Specification.new do |s|
     "share/color/color_names",
     "share/color/diverging_colors.hex",
     "share/software/install_helpers",
+    "share/templates/command",
+    "share/templates/workflow.rb",
     "test/scout/indiferent_hash/test_case_insensitive.rb",
     "test/scout/indiferent_hash/test_options.rb",
     "test/scout/log/test_color.rb",

data/scout_commands/resource/produce

@@ -0,0 +1,66 @@
+#!/usr/bin/env ruby
+
+require 'scout'
+
+$0 = "scout #{$previous_commands.any? ? $previous_commands*" " + " " : "" }#{ File.basename(__FILE__) }" if $previous_commands
+
+options = SOPT.setup <<EOF
+
+Produce a resource
+
+$ #{$0} [<options>] <Resource> <file> 
+
+-h--help Print this help
+-W--workflows* Workflows to use; 'all' for all in Scout.etc.workflows:
+-r--requires* Files to require; 'all' for all in Scout.etc.requires:
+-f--force Force the production if the file is already present
+EOF
+if options[:help]
+  if defined? scout_usage
+    scout_usage 
+  else
+    puts SOPT.doc
+  end
+  exit 0
+end
+
+case options[:workflows]
+when nil, false, "false", "none"
+when "all"
+  Scout.etc.workflows.list.each do |workflow|
+    Workflow.require_workflow file
+  end if Scout.etc.workflows.exists?
+else
+  options[:workflows].split(/[ ,;|]/).each do |workflow|
+    Workflow.require_workflow workflow
+  end
+end
+
+case options[:requires]
+when nil, false, "false", "none"
+when "all"
+  Scout.etc.requires.list.each do |file|
+    require file
+  end if Scout.etc.requires.exists?
+else
+  options[:requires].split(/[ ,;|]/).each do |file|
+    require file
+  end
+end
+
+resource, path = ARGV
+
+begin
+  resource = Kernel.const_get(resource)
+rescue
+  begin
+    resource = Workflow.require_workflow resource
+  rescue
+    raise "Resource not found: #{ resource }"
+  end
+end
+
+force = options[:force]
+
+puts resource[path].produce(force).find
+

data/scout_commands/template

@@ -0,0 +1,52 @@
+#!/usr/bin/env ruby
+
+require 'scout'
+
+$0 = "scout #{$previous_commands.any? ? $previous_commands*" " + " " : "" }#{ File.basename(__FILE__) }" if $previous_commands
+
+options = SOPT.setup <<EOF
+
+Print a template
+
+$ #{$0} [<options>] <template> [<VAR>=<value>]*
+
+Print a template making the substitutions that follow
+
+-h--help Print this help
+-s--sub* List a substitutions as a parameter instead
+-s--var* List a substitutions as a parameter, variable name
+-s--value* List a substitutions as a parameter, value
+EOF
+if options[:help]
+  if defined? scout_usage
+    scout_usage 
+  else
+    puts SOPT.doc
+  end
+  exit 0
+end
+
+template, *subs = ARGV
+
+raise MissingParameterException, :template if template.nil?
+
+txt = Scout.share.templates[template].find_with_extension('rb').read
+
+if options[:sub]
+  subs ||= []
+  subs << options[:sub]
+end
+
+if options[:var]
+  subs ||= []
+  subs << [options[:var], options[:value]] * "="
+end
+
+
+subs.each do |sub|
+  key, value = sub.split("=")
+
+  txt.gsub!(key, value)
+end
+
+puts txt

data/scout_commands/workflow/install

@@ -49,6 +49,7 @@ Misc.in_dir(workflow_dir) do
       Log.info "Updating: " + workflow
       Misc.in_dir(Misc.snake_case(workflow)) do
         `git pull`
+        `git checkout scout 2> /dev/null`
         `git submodule init`
         `git submodule update`
       end
@@ -56,6 +57,7 @@ Misc.in_dir(workflow_dir) do
       Misc.in_dir(workflow) do
         Log.info "Updating: " + workflow
         `git pull`
+        `git checkout scout 2> /dev/null`
         `git submodule init`
         `git submodule update`
       end
@@ -93,6 +95,7 @@ Misc.in_dir(workflow_dir) do
       end
       Log.warn "Initializing and updating submodules for #{repo}. You might be prompted for passwords."
       Misc.in_dir(Misc.snake_case(workflow)) do
+        `git checkout scout 2> /dev/null`
         `git submodule init`
         `git submodule update`
       end

data/scout_commands/workflow/task

@@ -18,7 +18,7 @@ $ #{$0} [<options>] <workflow> <task>
 -h--help Print this help
 --nostream Disable job streaming
 --update Update jobs with newer dependencies
--jn--job_name* Name to use as job identifier
+-jn--jobname* Name to use as job identifier
 -li--load_inputs* Directory with inputs files to load
 -pf--print_filepath Print the file path
 -prov--provenance Print the step provenance
@@ -26,6 +26,7 @@ $ #{$0} [<options>] <workflow> <task>
 -rcl--recursive_clean Clean all steps
 -ct--clean_task* Clean a particular task
 -d--deploy* Deploy mode: serial, local, or SLURM (default 'serial')
+-od--override_deps* Override deps using 'Workflow#task=<path>' array_separated
 EOF
 
 workflow_name, task_name = ARGV
@@ -38,8 +39,8 @@ task = workflow.tasks[task_name.to_sym] if task_name
 
 options[:help] = true if task.nil?
 
-help, provenance, clean, recursive_clean, clean_task, load_inputs, jobname, print_filepath, deploy = IndiferentHash.process_options options, 
-  :help, :provenance, :clean, :recursive_clean, :clean_task, :load_inputs, :job_name, :print_filepath, :deploy,
+help, provenance, clean, recursive_clean, clean_task, load_inputs, jobname, print_filepath, deploy, override_deps = IndiferentHash.process_options options, 
+  :help, :provenance, :clean, :recursive_clean, :clean_task, :load_inputs, :jobname, :print_filepath, :deploy, :override_deps,
   :deploy => 'serial'
 
 if help
@@ -59,6 +60,13 @@ else
   job_inputs = task.get_SOPT
 end
 
+if override_deps
+  override_deps.split($array_separator || ",").each do |part|
+    t_, value = part.split("=")
+    job_inputs.merge!( t_ => value)
+  end
+end
+
 job = workflow.job(task_name, jobname, job_inputs)
 
 job.recursive_clean if recursive_clean
@@ -79,6 +87,7 @@ if clean_task
     end
 
     job.clean if job.task_name.to_s == clean_task.to_s
+    job.clean unless job.updated?
   end
 end
 
@@ -92,9 +101,19 @@ else
     orchestrator = Workflow::Orchestrator.new 3, "cpus" => Misc.processors
     orchestrator.process({}, job)
   when "slurm"
-    SLURM.orchestrate(job)
+    require 'rbbt-scout'
+    require_relative '../../modules/rbbt-util/lib/rbbt/hpc'
+    HPC::BATCH_MODULE = HPC.batch_system "SLURM"
+    HPC::BATCH_MODULE.orchestrate_job(job, {})
+    job.grace
   else 
-    OffsiteStep.setup(job, server: deploy, provided_inputs: job_inputs)
+    if deploy.end_with?('-slurm')
+      server = deploy.sub('-slurm','')
+      OffsiteStep.setup(job, server: server, slurm: true)
+    else
+      OffsiteStep.setup(job, server: deploy)
+    end
+
     job.run
   end unless job.done?
 

data/share/software/install_helpers

@@ -32,6 +32,7 @@ else
 		local basedir="$(realpath $1)"
 		local path="$(realpath "$2")"
     local pre=""
+    basedir=${basedir%.}
     while [[ ! $path = $basedir* ]]; do
       pre=${pre}../
       basedir=$(dirname $basedir)
@@ -44,9 +45,8 @@ function link(){
   local source="$1"
   local target="$2"
   local rel_source=$(relative_path "$(dirname $target)" "$source")
-  
+
   [ -h "$target" ] && rm "$target"
-  echo ln -s "$rel_source" "$target" 1>&2
   [ -h "$target" ] || ln -s "$rel_source" "$target"
 }