From 33b47b9b1b7ff02d3b04da8d6f763fe744aa39d8 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 13 Aug 2013 08:07:25 +0200 Subject: git-web--browse.sh: use "open" on Haiku diff --git a/git-web--browse.sh b/git-web--browse.sh index ae15253..1f6e306 100755 --- a/git-web--browse.sh +++ b/git-web--browse.sh @@ -132,6 +132,10 @@ if test -z "$browser" ; then if test -x /usr/bin/cygstart; then browser_candidates="cygstart $browser_candidates" fi + # /boot/system/haiku_loader indicates Haiku + if test -f /boot/system/haiku_loader; then + browser_candidates="open $browser_candidates" + fi for i in $browser_candidates; do init_browser_path $i -- 2.2.2 From e3bdc3cfdf6d91d622e9f047bb727272ab8528f5 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 19 Jan 2015 15:37:16 -0500 Subject: On Haiku use the user settings directory instead of HOME diff --git a/path.c b/path.c index 38f2ebd..9c7cb48 100644 --- a/path.c +++ b/path.c @@ -6,6 +6,11 @@ #include "string-list.h" #include "dir.h" +#ifdef __HAIKU__ +#include +#include +#endif + static int get_st_mode_bits(const char *path, int *mode) { struct stat st; @@ -946,10 +951,18 @@ char *xdg_config_home(const char *filename) { const char *home, *config_home; +#ifdef __HAIKU__ + char settingsPath[B_PATH_NAME_LENGTH]; assert(filename); + if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, true, settingsPath, + sizeof(settingsPath)) == B_OK) + return mkpathdup("%s/git/%s", settingsPath, filename); +#else config_home = getenv("XDG_CONFIG_HOME"); + assert(filename); if (config_home && *config_home) return mkpathdup("%s/git/%s", config_home, filename); +#endif home = getenv("HOME"); if (home) -- 2.2.2 From 34967add7a2fefa52b1a2b005745e17d1712545b Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Mon, 19 Jan 2015 15:50:09 -0500 Subject: Ensure config-directory exists before using it. diff --git a/config.c b/config.c index 248a21a..a04d467 100644 --- a/config.c +++ b/config.c @@ -1958,6 +1958,7 @@ int git_config_set_multivar_in_file(const char *config_filename, int ret; struct lock_file *lock = NULL; char *filename_buf = NULL; + char *config_dir = NULL; char *contents = NULL; size_t contents_sz; @@ -1971,6 +1972,12 @@ int git_config_set_multivar_in_file(const char *config_filename, if (!config_filename) config_filename = filename_buf = git_pathdup("config"); + config_dir = xstrdup(config_filename); + * find_last_dir_sep(config_dir) = '\0'; + if (access(config_dir, F_OK) != 0) + mkdir(config_dir, 0755); + free(config_dir); + /* * The lock serves a purpose in addition to locking: the new * contents of .git/config will be written into it. -- 2.2.2