diff bin/check-ports @ 58:28800573d702

Rename variables: the repo name in the "label" and "descr" variables at the end of the variable name
author Franz Glasner <fzglas.hg@dom66.de>
date Thu, 21 Mar 2019 00:57:31 +0100
parents ad454e403e24
children 4805789ebbb3
line wrap: on
line diff
--- a/bin/check-ports	Wed Mar 20 21:35:31 2019 +0100
+++ b/bin/check-ports	Thu Mar 21 00:57:31 2019 +0100
@@ -49,15 +49,15 @@
     eval _rversions=\"\${remote_${_repo}_versions}\"
     while read _rfqp _rl _rdescr ; do
         if [ ${_rfqp%-*} = ${_name} ] ; then
-            eval remote_${_repo}_label=\"\${_rl}\"
-            eval remote_${_repo}_descr=\"\${_rdescr}\"
+            eval remote_label_${_repo}=\"\${_rl}\"
+            eval remote_descr_${_repo}=\"\${_rdescr}\"
             return 0
         fi
     done <<EOF884657
 ${_rversions}
 EOF884657
-    eval remote_${_repo}_label=""
-    eval remote_${_repo}_descr=""
+    eval remote_label_${_repo}=""
+    eval remote_descr_${_repo}=""
     return 1
 }
 
@@ -189,7 +189,7 @@
             #
             case "${repository}" in
                 "${FREEBSD_REPO}")
-                    if [ \( "${llabel}" != '<' -a "${llabel}" != '=' \) -o "${remote_FreeBSD_label}" != '=' -o "${remote_LocalRepo_label}" != '?' -o "${remote_LocalBSDPorts_label}" != '?' ]; then
+                    if [ \( "${llabel}" != '<' -a "${llabel}" != '=' \) -o "${remote_label_FreeBSD}" != '=' -o "${remote_label_LocalRepo}" != '?' -o "${remote_label_LocalBSDPorts}" != '?' ]; then
                         _print_detail=1
                     fi
                     ;;
@@ -197,7 +197,7 @@
                     _print_detail=1
                     ;;
                 "${LOCALBSDPORTS_REPO}")
-                    if [ "${llabel}" != '=' -o "${remote_FreeBSD_label}" != '>' -o "${remote_LocalRepo_label}" != '?' -o "${remote_LocalBSDPorts_label}" = '?' -o "${remote_LocalBSDPorts_label}" = '<' ]; then
+                    if [ "${llabel}" != '=' -o "${remote_label_FreeBSD}" != '>' -o "${remote_label_LocalRepo}" != '?' -o "${remote_label_LocalBSDPorts}" = '?' -o "${remote_label_LocalBSDPorts}" = '<' ]; then
                         _print_detail=1
                     fi
                     ;;
@@ -210,7 +210,7 @@
                     ;;
             esac
         else
-            if [ \( \( "${llabel}" != '?' -a "${llabel}" != '=' \) -o \( "${remote_FreeBSD_label}" != '?' -a "${remote_FreeBSD_label}" != '=' \) -o \( "${remote_LocalBSDPorts_label}" != '?' -a "${remote_LocalBSDPorts_label}" != '=' \) -o \( "${remote_LocalRepo_label}" != '?' -a "${remote_LocalRepo_label}" != '=' \) \) -o \( "${repository}" = "${PORTS_DIRECT_INSTALLED_REPO}" \) ]; then
+            if [ \( \( "${llabel}" != '?' -a "${llabel}" != '=' \) -o \( "${remote_label_FreeBSD}" != '?' -a "${remote_label_FreeBSD}" != '=' \) -o \( "${remote_label_LocalBSDPorts}" != '?' -a "${remote_label_LocalBSDPorts}" != '=' \) -o \( "${remote_label_LocalRepo}" != '?' -a "${remote_label_LocalRepo}" != '=' \) \) -o \( "${repository}" = "${PORTS_DIRECT_INSTALLED_REPO}" \) ]; then
                 _print_detail=1
             fi
         fi
@@ -218,12 +218,12 @@
     if [ -n "${_print_detail}" ]; then
         print_title "${lfqp}" "${repository}"
         echo "   INDEX: ${llabel} ${ldescr}"
-        echo "   FreeBSD: ${remote_FreeBSD_label} ${remote_FreeBSD_descr}"
-        if [ \( -n "${alldata_LocalBSDPorts_flag}" \) -o \( "${remote_LocalBSDPorts_label}" != '?' \) ] ; then
-            echo "   LocalBSDPorts: ${remote_LocalBSDPorts_label} ${remote_LocalBSDPorts_descr}"
+        echo "   FreeBSD: ${remote_label_FreeBSD} ${remote_descr_FreeBSD}"
+        if [ \( -n "${alldata_LocalBSDPorts_flag}" \) -o \( "${remote_label_LocalBSDPorts}" != '?' \) ] ; then
+            echo "   LocalBSDPorts: ${remote_label_LocalBSDPorts} ${remote_descr_LocalBSDPorts}"
         fi
-        if [ \( -n "${alldata_LocalRepo_flag}" \) -o \( "${remote_LocalRepo_label}" != '?' \) ] ; then
-            echo "   LocalRepo: ${remote_LocalRepo_label} ${remote_LocalRepo_descr}"
+        if [ \( -n "${alldata_LocalRepo_flag}" \) -o \( "${remote_label_LocalRepo}" != '?' \) ] ; then
+            echo "   LocalRepo: ${remote_label_LocalRepo} ${remote_descr_LocalRepo}"
         fi
     fi
 done <<EOF856661111299999