diff options
| author | Jeff Cai <jeffcai@src.gnome.org> | 2008-02-20 15:49:22 +0800 |
|---|---|---|
| committer | Jeff Cai <jeffcai@src.gnome.org> | 2008-02-20 15:49:22 +0800 |
| commit | a5e3103c863488660d248872d582b004fc45e846 (patch) | |
| tree | 875420ff525408b56e51fb386607ba9a71acae10 | |
| parent | b52edd2ab1a5359a7dc7115a70064b620f6e72e2 (diff) | |
| download | gsoc2013-evolution-a5e3103c863488660d248872d582b004fc45e846.tar.gz gsoc2013-evolution-a5e3103c863488660d248872d582b004fc45e846.tar.zst gsoc2013-evolution-a5e3103c863488660d248872d582b004fc45e846.zip | |
Use "pkill -x" to kill the process and use "$HOME" instead
of "~".
Fix for bug #516648
svn path=/trunk/; revision=35060
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | plugins/backup-restore/ChangeLog | 7 | ||||
| -rw-r--r-- | plugins/backup-restore/backup.c | 12 |
4 files changed, 21 insertions, 7 deletions
@@ -1,3 +1,10 @@ +2008-02-20 Jeff Cai<jeff.cai@sun.com> + + ** Fix for bug #516648 + + * configure.in: + Use "pkill -x" to kill processes on Solaris. + 2008-02-18 Matthew Barnes <mbarnes@redhat.com> * configure.in: diff --git a/configure.in b/configure.in index 98be7a0deb..f7f9a891f4 100644 --- a/configure.in +++ b/configure.in @@ -1203,7 +1203,7 @@ dnl ***************** case "$host" in *solaris*) - AC_PATH_PROGS(KILL_PROCESS_CMD, pkill) + KILL_PROCESS_CMD="/usr/bin/pkill -x" ;; *) AC_PATH_PROGS(KILL_PROCESS_CMD, killall pkill) diff --git a/plugins/backup-restore/ChangeLog b/plugins/backup-restore/ChangeLog index 13f250e5b5..a91179b3f8 100644 --- a/plugins/backup-restore/ChangeLog +++ b/plugins/backup-restore/ChangeLog @@ -1,3 +1,10 @@ +2008-02-20 Jeff Cai<jeff.cai@sun.com> + + ** Fix for bug #516648 + + * backup.c: (backup), (restore): + Use $HOME instead of "~" + 2008-01-06 Christian Krause <chkr@plauener.de> * backup.c: (backup), (restore), (check), (main): Initialize static diff --git a/plugins/backup-restore/backup.c b/plugins/backup-restore/backup.c index 6c19871d4c..cd1894eee0 100644 --- a/plugins/backup-restore/backup.c +++ b/plugins/backup-restore/backup.c @@ -13,8 +13,8 @@ #include <libgnome/gnome-util.h> #define EVOLUTION "evolution" -#define EVOLUTION_DIR "~/.evolution/" -#define EVOLUTION_DIR_BACKUP "~/.evolution-old/" +#define EVOLUTION_DIR "$HOME/.evolution/" +#define EVOLUTION_DIR_BACKUP "$HOME/.evolution-old/" #define GCONF_DUMP_FILE "backup-restore-gconf.xml" #define GCONF_DUMP_PATH EVOLUTION_DIR GCONF_DUMP_FILE #define GCONF_DIR "/apps/evolution" @@ -81,7 +81,7 @@ backup (const char *filename) /* FIXME compression type?" */ /* FIXME date/time stamp?" */ /* FIXME backup location?" */ - command = g_strdup_printf ("cd ~ && tar zpcf %s .evolution .camel_certs", filename); + command = g_strdup_printf ("cd $HOME && tar zpcf %s .evolution .camel_certs", filename); s (command); g_free (command); @@ -113,11 +113,11 @@ restore (const char *filename) CANCEL (complete); txt = _("Backup current Evolution data"); s ("mv " EVOLUTION_DIR " " EVOLUTION_DIR_BACKUP); - s ("mv ~/.camel_certs ~/.camel_certs_old"); + s ("mv $HOME/.camel_certs ~/.camel_certs_old"); CANCEL (complete); txt = _("Extracting files from backup"); - command = g_strdup_printf ("cd ~ && tar zxf %s", filename); + command = g_strdup_printf ("cd $HOME && tar zxf %s", filename); s (command); g_free (command); @@ -129,7 +129,7 @@ restore (const char *filename) txt = _("Removing temporary backup files"); s ("rm -rf " GCONF_DUMP_PATH); s ("rm -rf " EVOLUTION_DIR_BACKUP); - s ("rm -rf ~/.camel_certs_old"); + s ("rm -rf $HOME/.camel_certs_old"); if (restart_arg) { CANCEL (complete); |