From 330e636ece058e9a73abb9e4b6c80fffec2d1993 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Thu, 20 Sep 2007 23:14:27 +0100 Subject: [PATCH] WinGit: move the file list to /etc/, do not delete it We need the file list for uninstalling, so do not delete it. Signed-off-by: Johannes Schindelin --- share/WinGit/install.tcl | 5 +---- share/WinGit/release.sh | 8 ++++---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/share/WinGit/install.tcl b/share/WinGit/install.tcl index 87cc2e0eee..8f228e5514 100644 --- a/share/WinGit/install.tcl +++ b/share/WinGit/install.tcl @@ -17,7 +17,7 @@ proc installGit {} { pack .listbox.list -expand yes -fill both raise .listbox - set list [open "$currentDirectory/fileList-builtins.txt" r] + set list [open "$currentDirectory/etc/fileList-builtins.txt" r] while {[gets $list line] >= 0} { .listbox.list insert end "copying builtin: $line\n" .listbox.list yview moveto 1 @@ -112,9 +112,6 @@ proc installGit {} { $currentDirectory/bin/sh.exe $location/Git\ Shell.lnk } - file delete $currentDirectory/fileList.txt - file delete $currentDirectory/fileList-builtins.txt - tk_dialog .info "WinGit installed" \ "WinGit was successfully installed" info 0 OK diff --git a/share/WinGit/release.sh b/share/WinGit/release.sh index a33b16ce83..b0664ba2ef 100644 --- a/share/WinGit/release.sh +++ b/share/WinGit/release.sh @@ -8,7 +8,7 @@ test -z "$1" && { TARGET="$HOME"/WinGit-$1.exe OPTS7="-m0=lzma -mx=9 -md=64M" TARGET7=tmp.7z -LIST7=fileList.txt +LIST7=etc/fileList.txt TMPDIR=/tmp/WinGit (test ! -d "$TMPDIR" || echo "Removing $TMPDIR" && rm -rf "$TMPDIR") && @@ -32,13 +32,13 @@ tar xvf - && mkdir lib/perl5/site_perl && cp /lib/{Error.pm,Git.pm} lib/perl5/site_perl/ && gitmd5=$(md5sum bin/git.exe | cut -c 1-32) && -md5sum bin/git-*.exe | sed -n "s/^$gitmd5 \\*//p" > fileList-builtins.txt && -rm $(cat fileList-builtins.txt) && +mkdir etc && +md5sum bin/git-*.exe | sed -n "s/^$gitmd5 \\*//p" > etc/fileList-builtins.txt && +rm $(cat etc/fileList-builtins.txt) && (cd /mingw && tar cf - bin/*{tcl,tk,wish,gpg,curl.exe,libcurl}* \ lib/*{tcl,tk}* libexec/gnupg/) | tar xvf - && strip bin/{[a-fh-z],g[a-oq-z]}*.exe && -mkdir etc && cp /git/contrib/completion/git-completion.bash etc/ && cp /etc/termcap etc/ && sed 's/^\. .*\(git-completion.bash\)/. \/etc\/\1/' \ -- 2.11.4.GIT