Improve Debian Trixie container.

Signed-off-by: Erez Geva <ErezGeva2@gmail.com>

debian/inst_arc.sh

@@ -10,15 +10,23 @@
 ###############################################################################
 main()
 {
- if [[ -n "$1" ]]; then
+ local -r a="$1"
+ if [[ -n "$a" ]]; then
   local n
-  local -r a="$1"
   local -a l
   for n in libgcrypt20-dev
-  do l+=($n:$a);done
-  export DEBIAN_FRONTEND=noninteractive
-  apt-get update
-  apt-get install -y --no-install-recommends ${l[@]}
+  do
+   local p="$n:$a"
+   if ! dpkg-query -s $p 2>/dev/null |\
+    grep -q '^Status: install ok installed'; then
+    l+=($p)
+   fi
+  done
+  if [[ ${#l[@]} -gt 0 ]]; then
+   export DEBIAN_FRONTEND=noninteractive
+   apt-get update
+   apt-get install -y --no-install-recommends ${l[@]}
+  fi
  fi
 }
 main "$@"

debian/make_docker.sh

@@ -34,7 +34,7 @@ main()
   local -r arch=$(dpkg --print-architecture) # amd64
   local -r archs='arm64'
   local -r dpkgs_bookworm=''
-  local -r dpkgs_trixie='librtpi-dev@'
+  local -r dpkgs_trixie='librtpi-dev@ libgcrypt20-dev@'
   local dpkgs_arch='libstdc++6 pkgconf
     libpython3-all-dev ruby-dev tcl-dev libpython3-dev libperl-dev
     libfastjson-dev libgtest-dev libgmock-dev lua-posix libjson-c-dev

tools/update_goarch.pl

@@ -35,7 +35,7 @@ sub main
   $dpkg_arc=`which dpkg-architecture 2> /dev/null`;
   $dpkg_arc =~ s/\n//;
   # Make sure we have the tool
-  return if $dpkg_arc eq "";
+  return unless $dpkg_arc ne '' and -x $dpkg_arc;
   my $fname = 'goarch.sh';
   open OUT, "> $fname";
   # Header