Clean up and consolidate field printing code in [ts]find

src/libexec/jattool-sfind

@@ -72,18 +72,16 @@ discover() {
             SuiteDomain=$(sprop domain)
             SuiteNs=$(sprop ns)
             SuiteSutPname=$(sprop sut_pname)
+            SuiteVersion=$(sprop version)
+            SuiteId=$(
+                echo -n "jats://$SuiteDomain/$SuiteNs"
+                test -n "$SuiteSutPname" && echo -n "/$SuiteSutPname"
+                echo //
+            )
             case $Fmt in
-                id)
-                    echo -n "jats://$SuiteDomain/$SuiteNs"
-                    test -n "$SuiteSutPname" && echo -n "/$SuiteSutPname"
-                    echo //
-                    ;;
-                path)
-                    echo "$SuiteDir"
-                    ;;
-                version)
-                    sprop version
-                    ;;
+                id)       echo "$SuiteId"      ;;
+                path)     echo "$SuiteDir"     ;;
+                version)  echo "$SuiteVersion" ;;
             esac
         done
 }

src/libexec/jattool-tfind

@@ -29,11 +29,14 @@ discover() {
             t_apath=$(dirname "$(readlink -f "$t_cand")")
             t_rpath=${t_apath#$s_dir/}
             s_id=$(jattool sfind -f id "$s_dir")
-            debug -v s_dir s_id t_apath t_rpath
+            s_ver=$(jattool sfind -f version "$s_dir")
+            t_id=$s_id$t_rpath
+            t_path=$s_dir/$t_rpath
+            debug -v s_dir s_id t_apath t_rpath t_id t_path
             case $Fmt in
-                path) echo "$s_dir/$t_rpath" ;;
-                id) echo "$s_id$t_rpath"   ;;
-                version) jattool sfind -f version "$s_dir" ;;
+                path)    echo "$t_path" ;;
+                id)      echo "$t_id"   ;;
+                version) echo "$s_ver"  ;;
             esac
         done
 }