You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

42 lines
1.7 KiB

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 17:39:22.000000000 +0000
+++ ./libr/core/cconfig.c 2017-06-14 22:12:21.397368964 +0000
@@ -2145,9 +2145,7 @@
#endif
SETCB ("dir.source", "", &cb_dirsrc, "Path to find source files");
SETPREF ("dir.types", "/usr/include", "Default path to look for cparse type files");
-#if __ANDROID__
- SETPREF ("dir.projects", "/data/data/org.radare.radare2installer/radare2/projects", "Default path for projects");
-#elif __WINDOWS__
+#if __WINDOWS__
SETPREF ("dir.projects", "~\\"R2_HOMEDIR"\\projects", "Default path for projects");
#else
SETPREF ("dir.projects", "~/"R2_HOMEDIR"/projects", "Default path for projects");
@@ -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");
SETPREF ("http.bind", "localhost", "Server address");
SETPREF ("http.homeroot", "~/.config/radare2/www", "http home root directory");
-#if __ANDROID__
- SETPREF ("http.root", "/data/data/org.radare.radare2installer/www", "http root directory");
-#elif __WINDOWS__
+#if __WINDOWS__
SETPREF ("http.root", "www", "http root directory");
#else
SETPREF ("http.root", R2_WWWROOT, "http root directory");