diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2011-12-23 13:07:25 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2011-12-23 13:14:29 +0800 |
| commit | 7de1862889a44b75278abb00da444a27ba99e65d (patch) | |
| tree | e263ca1b7d6186590f1b918a19ad0f818ea49e4f | |
| parent | 9a38889305241f6831feda75d175c34b1c743646 (diff) | |
| download | gsoc2013-evolution-7de1862889a44b75278abb00da444a27ba99e65d.tar.gz gsoc2013-evolution-7de1862889a44b75278abb00da444a27ba99e65d.tar.zst gsoc2013-evolution-7de1862889a44b75278abb00da444a27ba99e65d.zip | |
Bug 666675: Remove evolution-addressbook-clean
References evolution-addressbook-import, which was removed in 2007.
Clearly no point in keeping this script around.
| -rw-r--r-- | addressbook/tools/Makefile.am | 15 | ||||
| -rw-r--r-- | addressbook/tools/evolution-addressbook-clean.in | 24 |
2 files changed, 2 insertions, 37 deletions
diff --git a/addressbook/tools/Makefile.am b/addressbook/tools/Makefile.am index 26ead07ac5..4d2e6d4746 100644 --- a/addressbook/tools/Makefile.am +++ b/addressbook/tools/Makefile.am @@ -1,6 +1,5 @@ privlibexec_SCRIPTS = \ - csv2vcard \ - evolution-addressbook-clean + csv2vcard privlibexec_PROGRAMS = evolution-addressbook-export @@ -31,16 +30,6 @@ if OS_WIN32 evolution_addressbook_export_LDFLAGS = -mwindows endif -EXTRA_DIST = $(privlibexec_SCRIPTS) \ - evolution-addressbook-clean.in - -CLEANFILES= evolution-addressbook-clean - -evolution-addressbook-clean: evolution-addressbook-clean.in Makefile -## Use sed and then mv to avoid problems if the user interrupts. - sed -e 's?\@EVOLUTION_TOOLSDIR\@?$(privlibexecdir)?g' \ - -e 's?\@PERL\@?@PERL@?g' \ - < $(srcdir)/evolution-addressbook-clean.in > evolution-addressbook-clean.tmp \ - && mv evolution-addressbook-clean.tmp evolution-addressbook-clean +EXTRA_DIST = $(privlibexec_SCRIPTS) -include $(top_srcdir)/git.mk diff --git a/addressbook/tools/evolution-addressbook-clean.in b/addressbook/tools/evolution-addressbook-clean.in deleted file mode 100644 index 49a5c3b665..0000000000 --- a/addressbook/tools/evolution-addressbook-clean.in +++ /dev/null @@ -1,24 +0,0 @@ -#!@PERL@ -w - -sub do_system -{ - my ($command) = @_; - system ($command); - if ($? != 0) { - die "Command failed: $command"; - } -} - -$filename = `@EVOLUTION_TOOLSDIR@/evolution-addressbook-export`; -if ($? != 0) { - $! = $?; - die $!; -} - -$HOME = $ENV{"HOME"}; - -system ("@EVOLUTION_TOOLSDIR@/killev"); -do_system ("/bin/mv ${HOME}/.evolution/addressbook/local/system/addressbook.db ${HOME}/.evolution/addressbook/local/system/addressbook-backup.db"); -do_system ("@EVOLUTION_TOOLSDIR@/evolution-addressbook-import --input-file $filename"); -do_system ("/bin/rm $filename"); - |