diff --git a/.removed_files.txt b/.removed_files.txt deleted file mode 100644 index 2718500..0000000 --- a/.removed_files.txt +++ /dev/null @@ -1 +0,0 @@ -aerofs/aerofs-clean diff --git a/rc b/rc index 02ad350..f624d4e 100755 --- a/rc +++ b/rc @@ -36,25 +36,18 @@ function _q-tools-update-binary { fi local current_version local remote_version + local update_tempdir current_version=$( cat "$QTOOLSPATH"/.version ) remote_version=$( curl -f -s -L https://six9.net/software/q-tools/current.txt ) if [[ -n "$remote_version" ]]; then if [[ "$remote_version" != "$current_version" ]]; then set -u echo "Update $current_version => $remote_version" - curl -L -f -s https://six9.net/software/q-tools/current.tar.gz > "$QTOOLSPATH"/current.tar.gz || return - tar -xz -C "$QTOOLSPATH" -f "$QTOOLSPATH"/current.tar.gz || return - rm -rf \ - "$QTOOLSPATH"/.git \ - "$QTOOLSPATH"/current.tar.gz - local obsoleted_file - if [[ -e .removed_files.txt ]]; then - while read obsoleted_file; do - if [[ -e "$obsoleted_file" ]]; then - rm -f "$obsoleted_file" - fi - done < .removed_files.txt - fi + update_tempdir=$( mktemp -d -t qtools.XXXXXXXXX ) + curl -L -f https://six9.net/software/q-tools/current.tar.gz | tar -xz -C "$update_tempdir" || return + rsync -a --del "$update_tempdir"/ "$QTOOLSPATH" + rm -r "$update_tempdir" + touch .lastupdate set +u fi fi diff --git a/release.sh b/release.sh index 85695c2..024e85e 100755 --- a/release.sh +++ b/release.sh @@ -22,6 +22,3 @@ echo $version > ~/www/static/six9.net/software/q-tools/current.txt cd ~/www/static/six9.net/software/q-tools/ rm -r ~/tmp/q-tools-release-$$ SimpleWebPage - - -echo "If you deleted files, they should be added to .removed_files.txt"