build

Author: adrelanos

usr/share/usability-misc/dist-installer-cli-standalone

@@ -3334,6 +3334,8 @@ install_package_debian_common() {
   else
     APTGETOPT_SERIALIZED=()
     if [[ -v APTGETOPT ]]; then
+      true "INFO: APTGETOPT already set, keeping it."
+    else
       APTGETOPT=()
     fi
   fi
@@ -3565,6 +3567,7 @@ install_repositories_for_virtualbox_on_debian() {
   fi
 
   unstable_found=""
+  unstable_found_with_contrib=""
   unstable_clearnet="deb.debian.org"
   unstable_onion="2s4yqjx5ul6okpp3f2gaunr2syex5jgbfpfvhxxbbjwnrsvbk5v3qbid.onion"
   unstable_clearnet_uri_base="${unstable_clearnet}/debian/"
@@ -3654,6 +3657,7 @@ install_repositories_for_virtualbox_on_debian() {
   kicksecure_suites_debsource="${distro_codename_kicksecure_use}"
 
   kali_found=""
+  kali_found_with_contrib=""
   kali_clearnet="http.kali.org"
   #kali_onion="" ## non-existing
   kali_clearnet_uri_base="${kali_clearnet}/"
@@ -4467,7 +4471,7 @@ get_checkhash_cmd() {
     #has digest && checkhash=( 'digest' '-a' 'sha512' '-c' ) && break
     ## TODO: How to make openssl check the file without workarounds?
     #has openssl && checkhash=( 'openssl' 'dgst' '-sha512' '-r' ) && break
-    [ -z "${checkhash[0]}" ] && {
+    [ -z "${checkhash[0]:-}" ] && {
       die 1 "${underline}get_checkhash_cmd:${nounderline} Failed to find program that checks SHA512 hash sum."
     }
   done
@@ -4769,6 +4773,9 @@ set_transfer_proxy() {
       transfer_proxy_suffix=()
       transfer_proxy_prefix=( 'torsocks' '--isolate' '--address' "${proxy_addr}" '--port' "${proxy_port}" )
       ;;
+    *)
+      die 1 "set_transfer_proxy: unsupported transfer_utility: '${transfer_utility}'"
+      ;;
   esac
 }
 
@@ -4781,6 +4788,12 @@ torify_conn_maybe() {
   if [ ! "${onion}" = "1" ]; then
     if [ -z "${socks_proxy:-}" ]; then
       log notice "Not torifying connection: Due to '--onion' option not being requested (and 'socks_proxy' is unset)."
+      ## Proxy variables are intentionally initialized here (not in get_transfer_cmd)
+      ## so that nounset catches any code path that bypasses torify_conn_maybe.
+      ## The only other place these are set is set_transfer_proxy (tor path).
+      transfer_proxy_prefix=()
+      transfer_proxy_suffix=()
+      curl_transfer_proxy=()
       return 0
     fi
   fi