summary refs log tree commit diff
diff options
context:
space:
mode:
authorEvils <evils.devils@protonmail.com>2020-11-06 06:53:42 +0100
committerBjørn Forsman <bjorn.forsman@gmail.com>2020-11-07 16:29:52 +0100
commit50ec961174f634c0de08bfd223060ae1477235d3 (patch)
tree82323964bc28f0ffbfe911091dba68c4ec1be2bf
parent756f36b554c318ce77cc73502ac7280f0f37dd20 (diff)
downloadnixpkgs-50ec961174f634c0de08bfd223060ae1477235d3.tar
nixpkgs-50ec961174f634c0de08bfd223060ae1477235d3.tar.gz
nixpkgs-50ec961174f634c0de08bfd223060ae1477235d3.tar.bz2
nixpkgs-50ec961174f634c0de08bfd223060ae1477235d3.tar.lz
nixpkgs-50ec961174f634c0de08bfd223060ae1477235d3.tar.xz
nixpkgs-50ec961174f634c0de08bfd223060ae1477235d3.tar.zst
nixpkgs-50ec961174f634c0de08bfd223060ae1477235d3.zip
kicad: fix update.sh bootstrapping
it will now correctly build a version.nix file from scratch
-rwxr-xr-xpkgs/applications/science/electronics/kicad/update.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/science/electronics/kicad/update.sh b/pkgs/applications/science/electronics/kicad/update.sh
index 8c154c302c8..cfd78323b77 100755
--- a/pkgs/applications/science/electronics/kicad/update.sh
+++ b/pkgs/applications/science/electronics/kicad/update.sh
@@ -110,7 +110,7 @@ for version in "${all_versions[@]}"; do
     echo "Checking src" >&2
     src_rev="$(${get_rev} "${gitlab}"/code/kicad.git "${version}" | cut -f1)"
     has_rev="$(grep -sm 1 "\"${pname}\"" -A 4 "${file}" | grep -sm 1 "${src_rev}" || true)"
-    has_hash="$(grep -sm 1 "\"${pname}\"" -A 5 "${file}" | grep -sm 1 "sha256")"
+    has_hash="$(grep -sm 1 "\"${pname}\"" -A 5 "${file}" | grep -sm 1 "sha256" || true)"
     if [[ -n ${has_rev} && -n ${has_hash} && -z ${clean} ]]; then
       echo "Reusing old ${pname}.src.sha256, already latest .rev" >&2
       grep -sm 1 "\"${pname}\"" -A 5 "${file}" | grep -sm 1 "rev" -A 1
@@ -130,7 +130,7 @@ for version in "${all_versions[@]}"; do
         echo "Checking i18n" >&2
         i18n_rev="$(${get_rev} "${i18n}" "${version}" | cut -f1)"
         has_rev="$(grep -sm 1 "\"${pname}\"" -A 11 "${file}" | grep -sm 1 "${i18n_rev}" || true)"
-        has_hash="$(grep -sm 1 "\"${pname}\"" -A 12 "${file}" | grep -sm 1 "i18n.sha256")"
+        has_hash="$(grep -sm 1 "\"${pname}\"" -A 12 "${file}" | grep -sm 1 "i18n.sha256" || true)"
         if [[ -n ${has_rev} && -n ${has_hash} && -z ${clean} ]]; then
           echo "Reusing old kicad-i18n-${today}.src.sha256, already latest .rev" >&2
           grep -sm 1 "\"${pname}\"" -A 12 "${file}" | grep -sm 1 "i18n" -A 1
@@ -146,7 +146,7 @@ for version in "${all_versions[@]}"; do
             url="${gitlab}/libraries/kicad-${lib}.git"
             lib_rev="$(${get_rev} "${url}" "${version}" | cut -f1 | head -n1)"
             has_rev="$(grep -sm 1 "\"${pname}\"" -A 19 "${file}" | grep -sm 1 "${lib_rev}" || true)"
-            has_hash="$(grep -sm 1 "\"${pname}\"" -A 20 "${file}" | grep -sm 1 "${lib}.sha256")"
+            has_hash="$(grep -sm 1 "\"${pname}\"" -A 20 "${file}" | grep -sm 1 "${lib}.sha256" || true)"
             if [[ -n ${has_rev} && -n ${has_hash} && -z ${clean} ]]; then
               echo "Reusing old kicad-${lib}-${today}.src.sha256, already latest .rev" >&2
               grep -sm 1 "\"${pname}\"" -A 20 "${file}" | grep -sm 1 "${lib}" -A 1