Merge pull request #14 from carapace-sh/termux-fix-path

termux: fix path
carapace-sh · Oct 27, 2024 · f09a3aa · f09a3aa
2 parents b99bcb9 + eff3853
commit f09a3aa
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/termux/1-hardcoded-etc-resolv-conf/patch.diff b/termux/1-hardcoded-etc-resolv-conf/patch.diff
@@ -25,7 +25,7 @@
  				switch c.mdnsTest {
  				case mdnsFromSystem:
 -					_, err := os.Stat("/etc/mdns.allow")
-+					_, err := os.Stat("/data/data/com.termux/files/etc/mdns.allow")
++					_, err := os.Stat("/data/data/com.termux/files/usr/etc/mdns.allow")
  					if err != nil && !errors.Is(err, fs.ErrNotExist) {
  						// Let libc figure out what is going on.
  						return hostLookupCgo, dnsConf
@@ -56,7 +56,7 @@
 
  func getSystemDNSConfig() *dnsConfig {
 -	resolvConf.tryUpdate("/etc/resolv.conf")
-+	resolvConf.tryUpdate("/data/data/com.termux/files/etc/resolv.conf")
++	resolvConf.tryUpdate("/data/data/com.termux/files/usr/etc/resolv.conf")
  	return resolvConf.dnsConfig.Load()
  }
 
@@ -65,7 +65,7 @@
  	// Set dnsConfig and lastChecked so we don't parse
  	// resolv.conf twice the first time.
 -	conf.dnsConfig.Store(dnsReadConfig("/etc/resolv.conf"))
-+	conf.dnsConfig.Store(dnsReadConfig("/data/data/com.termux/files/etc/resolv.conf"))
++	conf.dnsConfig.Store(dnsReadConfig("/data/data/com.termux/files/usr/etc/resolv.conf"))
  	conf.lastChecked = time.Now()
 
  	// Prepare ch so that only one update of resolverConfig may
diff --git a/termux/3-src-crypto-x509-root_linux.go/patch.diff b/termux/3-src-crypto-x509-root_linux.go/patch.diff
@@ -6,7 +6,7 @@ index 8e79ccb..1176471 100644
 
  // Possible certificate files; stop after finding one.
  var certFiles = []string{
-+	"/data/data/com.termux/files/etc/tls/cert.pem",                  // Termux
++	"/data/data/com.termux/files/usr/etc/tls/cert.pem",  // Termux
  	"/etc/ssl/certs/ca-certificates.crt",                // Debian/Ubuntu/Gentoo etc.
  	"/etc/pki/tls/certs/ca-bundle.crt",                  // Fedora/RHEL 6
  	"/etc/ssl/ca-bundle.pem",                            // OpenSUSE
diff --git a/termux/4-src-os-file_unix.go.patch/patch.diff b/termux/4-src-os-file_unix.go.patch/patch.diff
@@ -7,7 +7,7 @@ index a527b23..3a302f9 100644
  	if dir == "" {
  		if runtime.GOOS == "android" {
 -			dir = "/data/local/tmp"
-+			dir = "/data/data/com.termux/files/tmp"
++			dir = "/data/data/com.termux/files/usr/tmp"
  		} else {
  			dir = "/tmp"
  		}