Merge pull request #132 from Suwayomi/main

fix ipv6 resolvers
Suwayomi · Jan 17, 2024 · 4bbc197 · 4bbc197
2 parents 22f906d + 0ce8b2a
commit 4bbc197
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/set-env-variable.sh b/set-env-variable.sh
@@ -7,12 +7,6 @@
 # exec "$@"
 
 TMP=$(echo "$suwayomi" | sed "s@/\$@@")
-TMP2=$(awk 'BEGIN{ORS=" "} $1=="nameserver" {print $2}' /etc/resolv.conf)
-regex='^([0-9a-fA-F]{0,4}:){1,7}[0-9a-fA-F]{0,4}$'
-if [[ $TMP2 =~ $regex ]]; then
-  sed -i "s@resolverPLACEHOLDER@[$TMP2]@" /etc/nginx/conf.d/default.conf
-else
-  sed -i "s@resolverPLACEHOLDER@$TMP2@" /etc/nginx/conf.d/default.conf
-fi
-
+TMP2=$(awk '$1=="nameserver" && $2~/^((25[0-5]|(2[0-4]|1[0-9]|[1-9]|)[0-9])\.?){4}$/ {print $2}' /etc/resolv.conf)
+sed -i "s@resolverPLACEHOLDER@$TMP2@" /etc/nginx/conf.d/default.conf
 sed -i "s@PLACEHOLDER@$TMP@" /etc/nginx/conf.d/default.conf
diff --git a/vite.config.ts b/vite.config.ts
@@ -3,7 +3,6 @@ import { sveltekit } from '@sveltejs/kit/vite';
 import { defineConfig } from 'vite';
 
 export default defineConfig({
-	// @ts-expect-error Type 'Promise<Plugin<any>[]>' is not assignable to type 'PluginOption'
 	plugins: [sveltekit(), purgeCss()],
 	server: {
 		proxy: {