radare2: Fix opening browser (closes #1089)

This commit is contained in:
Fredrik Fornwall 2017-06-15 00:16:58 +02:00
parent 28befb629d
commit b9f25063dd
2 changed files with 20 additions and 3 deletions

View File

@ -1,6 +1,7 @@
TERMUX_PKG_HOMEPAGE=https://rada.re TERMUX_PKG_HOMEPAGE=https://rada.re
TERMUX_PKG_DESCRIPTION="Advanced Hexadecimal Editor" TERMUX_PKG_DESCRIPTION="Advanced Hexadecimal Editor"
TERMUX_PKG_VERSION=1.5.0 TERMUX_PKG_VERSION=1.5.0
TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL=https://github.com/radare/radare2/archive/$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SRCURL=https://github.com/radare/radare2/archive/$TERMUX_PKG_VERSION.tar.gz
TERMUX_PKG_SHA256=c6b465cb2f36a206d5e9380c0bcbb4c05ed5cb7995e554703206e0bbdc9c74a1 TERMUX_PKG_SHA256=c6b465cb2f36a206d5e9380c0bcbb4c05ed5cb7995e554703206e0bbdc9c74a1
TERMUX_PKG_FOLDERNAME="radare2-$TERMUX_PKG_VERSION" TERMUX_PKG_FOLDERNAME="radare2-$TERMUX_PKG_VERSION"

View File

@ -1,6 +1,6 @@
diff -u -r ../radare2-1.5.0/libr/core/cconfig.c ./libr/core/cconfig.c diff -u -r ../radare2-1.5.0/libr/core/cconfig.c ./libr/core/cconfig.c
--- ../radare2-1.5.0/libr/core/cconfig.c 2017-05-30 18:46:34.000000000 +0200 --- ../radare2-1.5.0/libr/core/cconfig.c 2017-05-30 17:39:22.000000000 +0000
+++ ./libr/core/cconfig.c 2017-05-30 19:39:39.339205400 +0200 +++ ./libr/core/cconfig.c 2017-06-14 22:12:21.397368964 +0000
@@ -2145,9 +2145,7 @@ @@ -2145,9 +2145,7 @@
#endif #endif
SETCB ("dir.source", "", &cb_dirsrc, "Path to find source files"); SETCB ("dir.source", "", &cb_dirsrc, "Path to find source files");
@ -12,7 +12,23 @@ diff -u -r ../radare2-1.5.0/libr/core/cconfig.c ./libr/core/cconfig.c
SETPREF ("dir.projects", "~\\"R2_HOMEDIR"\\projects", "Default path for projects"); SETPREF ("dir.projects", "~\\"R2_HOMEDIR"\\projects", "Default path for projects");
#else #else
SETPREF ("dir.projects", "~/"R2_HOMEDIR"/projects", "Default path for projects"); SETPREF ("dir.projects", "~/"R2_HOMEDIR"/projects", "Default path for projects");
@@ -2300,9 +2298,7 @@ @@ -2283,6 +2281,9 @@
#if __WINDOWS__
r_config_set (cfg, "http.browser", "start");
#else
+#ifdef __ANDROID__
+ r_config_set (cfg, "http.browser", "xdg-open");
+#else
if (r_file_exists ("/usr/bin/openURL")) { // iOS ericautils
r_config_set (cfg, "http.browser", "/usr/bin/openURL");
} else if (r_file_exists ("/system/bin/toolbox")) {
@@ -2295,14 +2296,13 @@
} else {
r_config_set (cfg, "http.browser", "firefox");
}
+#endif
r_config_desc (cfg, "http.browser", "Command to open HTTP URLs");
#endif
SETI ("http.maxsize", 0, "Maximum file size for upload"); SETI ("http.maxsize", 0, "Maximum file size for upload");
SETPREF ("http.bind", "localhost", "Server address"); SETPREF ("http.bind", "localhost", "Server address");
SETPREF ("http.homeroot", "~/.config/radare2/www", "http home root directory"); SETPREF ("http.homeroot", "~/.config/radare2/www", "http home root directory");