Revert "#124 printf.sh"

This reverts commit c9b9dcc.
yegor256 · Oct 23, 2023 · 1a68470 · 1a68470
1 parent c9b9dcc
commit 1a68470
Show file tree

Hide file tree

Showing 29 changed files with 62 additions and 126 deletions.
diff --git a/filters/010-delete-non-java-files.sh b/filters/010-delete-non-java-files.sh
@@ -41,9 +41,9 @@ while IFS= read -r f; do
 done < "${list}"
 
 if [ -s "${list}" ]; then
-    "${LOCAL}/help/printf.sh" "%'d files out of %'d without the \\\ff{.java} extension were deleted" \
+    printf "%'d files out of %'d without the \\\ff{.java} extension were deleted" \
         "$(wc -l < "${list}" | xargs)" "${total}"
 else
-    "${LOCAL}/help/printf.sh" "%'d files were \\\ff{.java} files, nothing was deleted" \
+    printf "%'d files were \\\ff{.java} files, nothing was deleted" \
         "${total}"
 fi
diff --git a/filters/020-delete-package-info.sh b/filters/020-delete-package-info.sh
@@ -39,8 +39,8 @@ while IFS= read -r f; do
 done < "${list}"
 
 if [ -s "${list}" ]; then
-    "${LOCAL}/help/printf.sh" "%'d files named as \\\ff{package-info.java} were deleted" \
+    printf "%'d files named as \\\ff{package-info.java} were deleted" \
         "$(wc -l < "${list}" | xargs)"
 else
-    "${LOCAL}/help/printf.sh" "There were no files named \\\ff{package-info.java}, nothing to delete"
+    printf "There were no files named \\\ff{package-info.java}, nothing to delete"
 fi
diff --git a/filters/030-delete-tests.sh b/filters/030-delete-tests.sh
@@ -47,8 +47,8 @@ while IFS= read -r f; do
 done < "${list}"
 
 if [ -s "${list}" ]; then
-    "${LOCAL}/help/printf.sh" "%'d files out of %'d with \\\ff{Test} or \\\ff{ITCase} suffixes were deleted" \
+    printf "%'d files out of %'d with \\\ff{Test} or \\\ff{ITCase} suffixes were deleted" \
         "$(wc -l < "${list}" | xargs)" "${total}"
 else
-    "${LOCAL}/help/printf.sh" "There were no test files among %d files seen" "${total}"
+    printf "There were no test files among %d files seen" "${total}"
 fi
diff --git a/filters/040-delete-unparseable.sh b/filters/040-delete-unparseable.sh
@@ -45,16 +45,16 @@ mkdir -p "$(dirname "${candidates}")"
 find "${home}" -type f -name '*.java' -print > "${candidates}"
 py=${LOCAL}/filters/delete-unparseable.py
 while IFS= read -r f; do
-    "${LOCAL}/help/printf.sh" "python3 %s %s %s\n" "${py@Q}" "${f@Q}" "${list@Q}" >> "${jobs}"
+    printf "python3 %s %s %s\n" "${py@Q}" "${f@Q}" "${list@Q}" >> "${jobs}"
 done < "${candidates}"
 "${LOCAL}/help/parallel.sh" "${jobs}"
 wait
 
 total=$(wc -l < "${candidates}" | xargs)
 if [ -s "${list}" ]; then
-    "${LOCAL}/help/printf.sh" "%'d files out of %'d with broken Java syntax were deleted" \
+    printf "%'d files out of %'d with broken Java syntax were deleted" \
         "$(wc -l < "${list}" | xargs)" "${total}"
 else
-    "${LOCAL}/help/printf.sh" "No files out of %'d had broken Java syntax" \
+    printf "No files out of %'d had broken Java syntax" \
         "${total}"
 fi
diff --git a/filters/050-delete-long-lines.sh b/filters/050-delete-long-lines.sh
@@ -50,9 +50,9 @@ done < "${candidates}"
 
 total=$(wc -l < "${candidates}" | xargs)
 if [ -s "${list}" ]; then
-    "${LOCAL}/help/printf.sh" "%'d files out of %'d with at least one line longer than %'d characters, which most probably is a symptom of an auto-generated code, were deleted" \
+    printf "%'d files out of %'d with at least one line longer than %'d characters, which most probably is a symptom of an auto-generated code, were deleted" \
         "$(wc -l < "${list}" | xargs)" "${total}" "${max}"
 else
-    "${LOCAL}/help/printf.sh" "No files out of %'d had lines longer than %'d characters" \
+    printf "No files out of %'d had lines longer than %'d characters" \
         "${total}" "${max}"
 fi
diff --git a/filters/060-delete-non-classes.sh b/filters/060-delete-non-classes.sh
@@ -45,16 +45,16 @@ mkdir -p "$(dirname "${candidates}")"
 find "${home}" -type f -name '*.java' -print > "${candidates}"
 py=${LOCAL}/filters/delete-non-classes.py
 while IFS= read -r f; do
-    "${LOCAL}/help/printf.sh" "python3 %s %s %s\n" "${py@Q}" "${f@Q}" "${list@Q}" >> "${jobs}"
+    printf "python3 %s %s %s\n" "${py@Q}" "${f@Q}" "${list@Q}" >> "${jobs}"
 done < "${candidates}"
 "${LOCAL}/help/parallel.sh" "${jobs}"
 wait
 
 total=$(wc -l < "${candidates}" | xargs)
 if [ -s "${list}" ]; then
-    "${LOCAL}/help/printf.sh" "%'d files out of %'d with interfaces or enums (instead of classes) inside were deleted" \
+    printf "%'d files out of %'d with interfaces or enums (instead of classes) inside were deleted" \
         "$(wc -l < "${list}" | xargs)" "${total}"
 else
-    "${LOCAL}/help/printf.sh" "All %d files are Java classes, nothing to delete" \
+    printf "All %d files are Java classes, nothing to delete" \
         "${total}"
 fi
diff --git a/filters/070-delete-invalid-files.sh b/filters/070-delete-invalid-files.sh
@@ -45,20 +45,20 @@ mkdir -p "$(dirname "${candidates}")"
 find "${home}" -type f -name '*.java' -print > "${candidates}"
 py=${LOCAL}/filters/delete-invalid-files.py
 while IFS= read -r f; do
-    "${LOCAL}/help/printf.sh" "python3 %s %s %s\n" "${py@Q}" "${f@Q}" "${list@Q}" >> "${jobs}"
+    printf "python3 %s %s %s\n" "${py@Q}" "${f@Q}" "${list@Q}" >> "${jobs}"
 done < "${candidates}"
 "${LOCAL}/help/parallel.sh" "${jobs}"
 wait
 
 total=$(wc -l < "${candidates}" | xargs)
 if [ -s "${list}" ]; then
-    "${LOCAL}/help/printf.sh" "%'d files out of %'d with more than one Java class inside were deleted" \
+    printf "%'d files out of %'d with more than one Java class inside were deleted" \
         "$(wc -l < "${list}")" "${total}"
 else
     if [ "${total}" -eq 0 ]; then
-        "${LOCAL}/help/printf.sh" "There were no Java classes, nothing to delete"
+        printf "There were no Java classes, nothing to delete"
     else
-        "${LOCAL}/help/printf.sh" "All %'d files are Java classes, nothing to delete" \
+        printf "All %'d files are Java classes, nothing to delete" \
             "${total}"
     fi
 fi
diff --git a/filters/080-delete-symlinks.sh b/filters/080-delete-symlinks.sh
@@ -42,8 +42,8 @@ done
 
 total=$(wc -l < "${list}" | xargs)
 if [ "${total}" -eq 0 ]; then
-    "${LOCAL}/help/printf.sh" "There were no symlinks"
+    printf "There were no symlinks"
 else
-    "${LOCAL}/help/printf.sh" "%'d symlinks were deleted" "${total}"
+    printf "%'d symlinks were deleted" "${total}"
 fi
 
diff --git a/filters/090-delete-empty-directories.sh b/filters/090-delete-empty-directories.sh
@@ -42,8 +42,8 @@ done
 
 total=$(wc -l < "${list}" | xargs)
 if [ "${total}" -eq 0 ]; then
-    "${LOCAL}/help/printf.sh" "There were no empty directories"
+    printf "There were no empty directories"
 else
-    "${LOCAL}/help/printf.sh" "%'d empty directories were deleted" "${total}"
+    printf "%'d empty directories were deleted" "${total}"
 fi
 
diff --git a/help/float.sh b/help/float.sh
@@ -26,8 +26,8 @@ set -o pipefail
 num=$(cat)
 
 if [ "${num}" == 'NaN' ]; then
-    "${LOCAL}/help/printf.sh" '%s' "${num}"
+    printf '%s' "${num}"
     exit
 fi
 
-("${LOCAL}/help/printf.sh" '%.8f' "${num}" 2>/dev/null || echo 0) | sed -e 's/0\+$//' | sed -e 's/\.$//'
+(printf '%.8f' "${num}" 2>/dev/null || echo 0) | sed -e 's/0\+$//' | sed -e 's/\.$//'
diff --git a/help/printf.sh b/help/printf.sh
diff --git a/help/tdiff.sh b/help/tdiff.sh
@@ -34,17 +34,17 @@ mks=$(echo "($(date +%s%N) - ${start}) / 1000" | bc)
 if ((mks < 100)); then
     exit
 elif ((mks < 1000)); then
-    "${LOCAL}/help/printf.sh" '%s%dμs' "${pfx}" "${mks}"
+    printf '%s%dμs' "${pfx}" "${mks}"
 elif ((mks < 1000 * 1000)); then
-    "${LOCAL}/help/printf.sh" '%s%dms' "${pfx}" "$((mks / 1000))"
+    printf '%s%dms' "${pfx}" "$((mks / 1000))"
 elif ((mks < 60 * 1000 * 1000)); then
-    "${LOCAL}/help/printf.sh" '%s%ds' "${pfx}" "$((mks / (1000 * 1000)))"
+    printf '%s%ds' "${pfx}" "$((mks / (1000 * 1000)))"
 elif ((mks < 60 * 60 * 1000 * 1000)); then
     minutes=$((mks / (60 * 1000 * 1000)))
     seconds=$(((mks - minutes * 60 * 1000 * 1000) / (1000 * 1000)))
-    "${LOCAL}/help/printf.sh" '%s%dm%ds' "${pfx}" "${minutes}" "${seconds}"
+    printf '%s%dm%ds' "${pfx}" "${minutes}" "${seconds}"
 else
     hours=$((mks / (60 * 60 * 1000 * 1000)))
     minutes=$(((mks - hours * 60 * 60 * 1000 * 1000) / (60 * 1000 * 1000)))
-    "${LOCAL}/help/printf.sh" '%s%dh%dm' "${pfx}" "${hours}" "${minutes}"
+    printf '%s%dh%dm' "${pfx}" "${hours}" "${minutes}"
 fi
diff --git a/help/to-csv.sh b/help/to-csv.sh
@@ -27,4 +27,4 @@ set -o pipefail
 # suitable for CSV: replacing commas.
 
 data=$(cat)
-"${LOCAL}/help/printf.sh" '%s' "${data}" | sed 's/,/\\,/'
+printf '%s' "${data}" | sed 's/,/\\,/'
diff --git a/steps/aggregate-join.sh b/steps/aggregate-join.sh
@@ -39,9 +39,9 @@ echo "${csvs}" | while IFS= read -r csv; do
     mkdir -p "$(dirname "${join}")"
     while IFS= read -r t; do
         if [ ! -e "${join}" ]; then
-            "${LOCAL}/help/printf.sh" 'repo,%s\n' "${t}" > "${join}"
+            printf 'repo,%s\n' "${t}" > "${join}"
         else
-            "${LOCAL}/help/printf.sh" '%s,%s\n' "$(echo "${repo}" | "${LOCAL}/help/to-csv.sh")" "${t}" >> "${join}"
+            printf '%s,%s\n' "$(echo "${repo}" | "${LOCAL}/help/to-csv.sh")" "${t}" >> "${join}"
         fi
     done < "${dir}/${csv}"
 done

diff --git a/steps/aggregate-repo.sh b/steps/aggregate-repo.sh
@@ -64,33 +64,33 @@ find "${dir}" -type f -name '*.m' | {
             csv=${ddir}/${metric}.csv
             mkdir -p "$(dirname "${csv}")"
             if [ ! -e "${csv}" ]; then
-                "${LOCAL}/help/printf.sh" 'java_file,%s\n' "${metric}" > "${csv}"
+                printf 'java_file,%s\n' "${metric}" > "${csv}"
             fi
-            "${LOCAL}/help/printf.sh" '%s,%s\n' "$(echo "${java}" | "${LOCAL}/help/to-csv.sh")" "$(cat "${v}")" >> "${csv}"
+            printf '%s,%s\n' "$(echo "${java}" | "${LOCAL}/help/to-csv.sh")" "$(cat "${v}")" >> "${csv}"
         done
         csv=${ddir}/all.csv
         mkdir -p "$(dirname "${csv}")"
         if [ ! -e "${csv}" ]; then
-            "${LOCAL}/help/printf.sh" 'java_file' > "${csv}"
+            printf 'java_file' > "${csv}"
             for a in ${metrics}; do
-                "${LOCAL}/help/printf.sh" ",%s" "${a}" >> "${csv}"
+                printf ",%s" "${a}" >> "${csv}"
             done
-            "${LOCAL}/help/printf.sh" '\n' >> "${csv}"
+            printf '\n' >> "${csv}"
         fi
         java=$(echo "${m}" | sed "s|${dir}||" | sed "s|\.m$||")
-        "${LOCAL}/help/printf.sh" '%s' "$(echo "${java}" | "${LOCAL}/help/to-csv.sh")" >> "${csv}"
+        printf '%s' "$(echo "${java}" | "${LOCAL}/help/to-csv.sh")" >> "${csv}"
         for a in ${metrics}; do
             if [ -e "${m}.${a}" ]; then
                 value=$("${LOCAL}/help/float.sh" < "${m}.${a}")
-                "${LOCAL}/help/printf.sh" ",%s" "${value}" >> "${csv}"
+                printf ",%s" "${value}" >> "${csv}"
                 if [ ! "${value}" = "NaN" ]; then
                     sum=$(echo "${sum} + ${value}" | bc | "${LOCAL}/help/float.sh")
                 fi
             else
-                "${LOCAL}/help/printf.sh" ',-' >> "${csv}"
+                printf ',-' >> "${csv}"
             fi
         done
-        "${LOCAL}/help/printf.sh" '\n' >> "${csv}"
+        printf '\n' >> "${csv}"
         total=$((total+1))
     done
     echo "${repo} (${pos}/${total}) aggregated (files=${total}, sum=${sum})$("${LOCAL}/help/tdiff.sh" "${start}")"

diff --git a/steps/aggregate.sh b/steps/aggregate.sh
@@ -40,19 +40,19 @@ declare -i repo=0
 sh="$(dirname "$0")/aggregate-repo.sh"
 echo "${repos}" | while IFS= read -r r; do
     repo=$((repo+1))
-    "${LOCAL}/help/printf.sh" "%s %s %s %s %s\n" "${sh@Q}" "${r@Q}" "${repo@Q}" "${total@Q}" "${metrics@Q}" >> "${jobs}"
+    printf "%s %s %s %s %s\n" "${sh@Q}" "${r@Q}" "${repo@Q}" "${total@Q}" "${metrics@Q}" >> "${jobs}"
 done
 "${LOCAL}/help/parallel.sh" "${jobs}"
 wait
 
 mkdir -p "${TARGET}/data"
 rm -rf "${TARGET}/data/*.csv"
 all=${TARGET}/data/all.csv
-"${LOCAL}/help/printf.sh" "repository,file" >> "${all}"
+printf "repository,file" >> "${all}"
 echo "${metrics}" | while IFS= read -r a; do
-    "${LOCAL}/help/printf.sh" ',%s' "${a}" >> "${all}"
+    printf ',%s' "${a}" >> "${all}"
 done
-"${LOCAL}/help/printf.sh" "\n" >> "${all}"
+printf "\n" >> "${all}"
 
 jobs=${TARGET}/temp/jobs/aggregate-join-jobs.txt
 rm -rf "${jobs}"
@@ -64,7 +64,7 @@ repos=$(find "${TARGET}/data" -maxdepth 2 -mindepth 2 -type d -print)
 echo "${repos}" | while IFS= read -r d; do
     r=$(realpath --relative-to="${TARGET}/data" "${d}" )
     repo=$((repo+1))
-    "${LOCAL}/help/printf.sh" "%s %s %s %s %s\n" "${sh@Q}" "${r@Q}" "${d@Q}" "${repo@Q}" "${total@Q}" >> "${jobs}"
+    printf "%s %s %s %s %s\n" "${sh@Q}" "${r@Q}" "${d@Q}" "${repo@Q}" "${total@Q}" >> "${jobs}"
  done
 "${LOCAL}/help/parallel.sh" "${jobs}"
 wait

diff --git a/steps/clone-repo.sh b/steps/clone-repo.sh
@@ -64,8 +64,8 @@ done
 
 hashes=${TARGET}/hashes.csv
 if [ ! -e "${hashes}" ]; then
-    "${LOCAL}/help/printf.sh" "repo,hash\n" > "${hashes}"
+    printf "repo,hash\n" > "${hashes}"
 fi
-"${LOCAL}/help/printf.sh" "%s,%s\n" "$(echo "${repo}" | "${LOCAL}/help/to-csv.sh")" "$(git --git-dir "${dir}/.git" rev-parse HEAD)" >> "${hashes}"
+printf "%s,%s\n" "$(echo "${repo}" | "${LOCAL}/help/to-csv.sh")" "$(git --git-dir "${dir}/.git" rev-parse HEAD)" >> "${hashes}"
 
 echo "${repo} cloned (${pos}/${total}), $(du -sh "${dir}" | cut -f1 | xargs)$("${LOCAL}/help/tdiff.sh" "${start}")"
diff --git a/steps/clone.sh b/steps/clone.sh
@@ -44,7 +44,7 @@ while IFS=',' read -r r tag tail; do
     if [ -e "${TARGET}/github/${r}" ]; then
         echo "${r}: Git repo is already here (${tail})"
     else
-        "${LOCAL}/help/printf.sh" "%s %s %s %s %s\n" "${sh@Q}" "${r@Q}" "${tag@Q}" "${repo@Q}" "${total@Q}" >> "${jobs}"
+        printf "%s %s %s %s %s\n" "${sh@Q}" "${r@Q}" "${tag@Q}" "${repo@Q}" "${total@Q}" >> "${jobs}"
     fi
 done < "${repos}"
 

diff --git a/steps/discover.sh b/steps/discover.sh
@@ -34,10 +34,10 @@ if [ -e "${csv}" ]; then
     echo "Before using REPO environment variable you should delete the ${csv} file ($(wc -l < "${csv}" | xargs) lines)"
     clones=${TARGET}/github
     if [ -e "${clones}" ]; then
-      "${LOCAL}/help/printf.sh" "ATTENTION: If you do this (delete the CSV file), and then run 'make' again, all cloned repositories in the '%s' directory will be deleted (%d directories). " \
+      printf "ATTENTION: If you do this (delete the CSV file), and then run 'make' again, all cloned repositories in the '%s' directory will be deleted (%d directories). " \
         "${TARGET}/github/" "$(find "${clones}" -type d -depth 2 | wc -l | xargs)"
-      "${LOCAL}/help/printf.sh" "After this, the dataset will not be suitable for further analysis! "
-      "${LOCAL}/help/printf.sh" "Think twice! If you just want to analyze one repository, do it in a different directory.\n"
+      printf "After this, the dataset will not be suitable for further analysis! "
+      printf "Think twice! If you just want to analyze one repository, do it in a different directory.\n"
     fi
     exit 1
   fi

diff --git a/steps/jpeek-repo.sh b/steps/jpeek-repo.sh
@@ -97,7 +97,7 @@ mkdir -p "$(dirname "${values}")"
 echo > "${values}"
 files=${TARGET}/temp/jpeek-files/${repo}.txt
 mkdir -p "$(dirname "${files}")"
-"${LOCAL}/help/printf.sh" '' > "${files}"
+printf '' > "${files}"
 for type in all cvc; do
     dir=${TARGET}/temp/jpeek/${type}/${repo}
     if [ ! -e "${dir}" ]; then

diff --git a/steps/jpeek.sh b/steps/jpeek.sh
@@ -41,7 +41,7 @@ sh="$(dirname "$0")/jpeek-repo.sh"
 for d in ${repos}; do
     r=$(realpath --relative-to="${TARGET}/github" "${d}" )
     repo=$((repo+1))
-    "${LOCAL}/help/printf.sh" "timeout 1h %s %s %s %s || true\n" "${sh@Q}" "${r@Q}" "${repo@Q}" "${total@Q}" >> "${jobs}"
+    printf "timeout 1h %s %s %s %s || true\n" "${sh@Q}" "${r@Q}" "${repo@Q}" "${total@Q}" >> "${jobs}"
 done
 
 "${LOCAL}/help/parallel.sh" "${jobs}"

diff --git a/steps/measure.sh b/steps/measure.sh
@@ -47,7 +47,7 @@ echo "${javas}" | while IFS= read -r java; do
         echo "Metrics already exist for $(basename "${java}") (${file}/${total})"
         continue
     fi
-    "${LOCAL}/help/printf.sh" "%s %s %s %s %s\n" "${sh@Q}" "${java@Q}" "${javam@Q}" "${file@Q}" "${total@Q}" >> "${jobs}"
+    printf "%s %s %s %s %s\n" "${sh@Q}" "${java@Q}" "${javam@Q}" "${file@Q}" "${total@Q}" >> "${jobs}"
     if [ "${file: -4}" = '0000' ]; then
         echo "Prepared ${file} jobs out of ${total}$("${LOCAL}/help/tdiff.sh" "${pstart}")..."
         pstart=$(date +%s%N)

diff --git a/steps/unregister.sh b/steps/unregister.sh
@@ -46,7 +46,7 @@ while IFS=',' read -r r tag tail; do
     if [ ! -e "${TARGET}/github/${r}" ]; then
         echo "The clone of ${r} is absent, unregistered"
     else
-        "${LOCAL}/help/printf.sh" "%s,%s,%s\n" "${r}" "${tag}" "${tail}" >> "${csv}"
+        printf "%s,%s,%s\n" "${r}" "${tag}" "${tail}" >> "${csv}"
         good=$((good+1))
     fi
 done < "${before}"

diff --git a/tests/filters/test-050-delete-long-lines.sh b/tests/filters/test-050-delete-long-lines.sh
@@ -45,7 +45,7 @@ echo "👍🏻 A Java file with short lines wasn't deleted"
 {
     java="${temp}/foo/bb/Привет.java"
     mkdir -p "$(dirname "${java}")"
-    "${LOCAL}/help/printf.sh" 'a%.0s' {1..5000} > "${java}"
+    printf 'a%.0s' {1..5000} > "${java}"
     rm -f "${list}"
     msg=$("${LOCAL}/filters/050-delete-long-lines.sh" "${temp}" "${temp}/temp")
     echo "${msg}"
@@ -60,7 +60,7 @@ echo "👍🏻 A Java file with a long line was deleted"
     # see https://stackoverflow.com/questions/77169978/how-to-reproduce-awk-warning-invalid-multibyte-data-detected
     java="${temp}/foo/bb/привет/Привет.java"
     mkdir -p "$(dirname "${java}")"
-    "${LOCAL}/help/printf.sh" '\xC0\x80' > "${java}"
+    printf '\xC0\x80' > "${java}"
     rm -f "${list}"
     msg=$(LC_ALL=en_US.UTF-8 "${LOCAL}/filters/050-delete-long-lines.sh" "$(dirname "${java}")" "${temp}/temp" 2>&1)
     test "$(echo "${msg}" | grep -c "Invalid multibyte data detected")" = 0

diff --git a/tests/help/test-float.sh b/tests/help/test-float.sh
@@ -1,4 +1,4 @@
-n#!/usr/bin/env bash
+#!/usr/bin/env bash
 # The MIT License (MIT)
 #
 # Copyright (c) 2021-2023 Yegor Bugayenko