Merge pull request #266 from jumpsmm7/dev

Dev
thuantran · Aug 17, 2021 · 3033eeb · 3033eeb
2 parents f829d56 + ee2dc93
commit 3033eeb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/installer b/installer
@@ -19,11 +19,11 @@
 #  | | |  \| | (___    | |  /  \  | |    | |    | |__  | |__) |   Current Maintainer:                  #
 #  | | | . ` |\___ \   | | / /\ \ | |    | |    |  __| |  _  /             SomeWhereOverTheRainBow     #
 # _| |_| |\  |____) |  | |/ ____ \| |____| |____| |____| | \ \                                         #
-#|_____|_| \_|_____/   |_/_/    \_|______|______|______|_|  \_\   v2.2.8                               #
+#|_____|_| \_|_____/   |_/_/    \_|______|______|______|_|  \_\   v2.2.9                               #
 #                                                                                                      #
 ########################################################################################################
 
-DI_VERSION="v2.2.8"
+DI_VERSION="v2.2.9"
 readonly LATEST_URL="https://api.github.com/repos/jedisct1/dnscrypt-proxy/releases/latest"
 readonly DNSCRYPT_VER="$(curl -sL "$LATEST_URL" | grep "tag_name" | head -1 | cut -d \" -f 4)"
 
@@ -537,7 +537,9 @@ choose_dnscrypt_server () {
       ;;
     2)
       toml_avar_disable disabled_server_names
-      choose_dnscrypt_server_manual
+      read_yesno "Do you only want to use the Oblivious DNS-over-HTTPS protocol?" && ODOH_ONLY="true" || ODOH_ONLY="false"
+      [ "$ODOH_ONLY" = "true" ] && choose_dnscrypt_server_odoh
+      [ "$ODOH_ONLY" = "false" ] && choose_dnscrypt_server_manual
       ;;
     3)
       toml_avar_disable disabled_server_names
@@ -548,16 +550,16 @@ choose_dnscrypt_server () {
 
 choose_dnscrypt_server_auto () {
   toml_avar_disable server_names
-  read_yesno "Use servers that support the ODoH protocol" && toml_avars_prep odoh_servers true || toml_avars_prep odoh_servers false
   read_yesno "Use servers that support the DNSCrypt protocol" && toml_avars_prep dnscrypt_servers true || toml_avars_prep dnscrypt_servers false
   read_yesno "Use servers that support the DNS-over-HTTPS protocol" && toml_avars_prep doh_servers true || toml_avars_prep doh_servers false
+  read_yesno "Use servers that support the Oblivious DNS-over-HTTPS protocol" && toml_avars_prep odoh_servers true || toml_avars_prep odoh_servers false
   read_yesno "Use only servers that support DNSSEC" && toml_avars_prep require_dnssec true || toml_avars_prep require_dnssec false
   read_yesno "Use only servers that do not log user's queries" && toml_avars_prep require_nolog true || toml_avars_prep require_nolog false
   read_yesno "Use only servers that do not filter result" && toml_avars_prep require_nofilter true || toml_avars_prep require_nofilter false
 }
 
 choose_dnscrypt_server_disabled () {
-  local INDEX 
+  local INDEX
   INDEX="$1"
   if [ -z "$INDEX" ]; then
     [ "$USE_IPV6" = "true" ] && USE_IPV6="NOMATCH" || USE_IPV6="6"
@@ -669,7 +671,8 @@ choose_dnscrypt_server_odoh () {
   else
     read_input_num "Please choose next DNS server or press n to stop." 1 "$INDEX" n
     if [ "$?" -eq 1 ]; then
-      RESOLVERS="${ORESOLVERS}, $RESOLVERS"
+      [ "$ODOH_ONLY" = "true" ] && toml_avars_prep server_names "\"[${ORESOLVERS}]\"" dnscrypt_servers false doh_servers false require_dnssec false require_nolog false require_nofilter false
+      [ "$ODOH_ONLY" = "false" ] && RESOLVERS="${ORESOLVERS}, $RESOLVERS"
       return
     fi
   fi

diff --git a/installer.md5sum b/installer.md5sum
@@ -1 +1 @@
-7d5fda044d713193cd025a85c6450e3d
+5771f17cc6b0651a41eae90d2b26720c