Merge branch 'multimedia'

[config/dotfiles.git] / archive.sh

diff --git a/archive.sh b/archive.sh
index ede6c7ecaf52864ef655adb3d670490bbb6e5593..26a0e8d667fb932068bed15ca2afc56ec4902d09 100755 (executable)
--- a/archive.sh
+++ b/archive.sh
@@ -21,15 +21,24 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-set -e
+set -eu
 
 git_clone() {
     git clone "$1" "$2" >/dev/null
     ( cd "$2" && git remote rm origin && git gc )
 }
 
+
+# Don't overwrite an existing file/directory.
+if test -e tmp; then
+    echo 'tmp/ already exists!'
+    exit 1
+fi
+
 git_clone . tmp/dotfiles
 for name in browser shell vcs vim x11; do
+    test -d $name || continue
+
     echo "cloning $name to tmp/"
     git_clone $name tmp/dotfiles/$name
 done