update

5 files changed, 30 insertions, 59 deletions

diff --git a/bin/extractSkelTar.sh b/bin/extractSkelTar.sh
deleted file mode 100755
index b7aa6d3..0000000
--- a/bin/extractSkelTar.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-BASENAME=$(dirname $0)
-cd $BASENAME/../
-
-tar -xzf skel.tgz --strip-components=1
diff --git a/bin/genSkelTar.sh b/bin/genSkelTar.sh
index 0b71bd2..0b84b7f 100755
--- a/bin/genSkelTar.sh
+++ b/bin/genSkelTar.sh
@@ -1,7 +1,17 @@
 #!/bin/bash
 
+# goto root dir (this script resides in bin)
 BASEDIR=$(dirname $0)
-cd $BASEDIR/../
+cd ${BASEDIR}/../
 
-rm -f skel.tar.gz
-tar -cvzf skel.tar.gz skel
+# cleanup old files
+rm -f skel.tar.gz skel.tar
+
+# generate files in 'gen'
+bin/genVimLatex.sh
+
+# pack files to skel.tar
+tar -cvf skel.tar skel
+tar -uvf skel.tar gen
+# compress to skel.tar.gz
+gzip skel.tar
diff --git a/bin/genVimConf.sh b/bin/genVimConf.sh
deleted file mode 100755
index 981f676..0000000
--- a/bin/genVimConf.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-# DEPRECATED
-
-BASEDIR=$(dirname $0)
-cd ${BASEDIR}
-
-rm -f vim.tar.gz vim.tar
-tar cf vim.tar .vim .vimrc
-
-./genVimLatex.sh
-cd vim-latex/pkg
-tar uf ../../vim.tar .vim
-mv bin/* ../../bin/
-cd ..
-rm -rf pkg
-cd ..
-
-gzip vim.tar
-
diff --git a/bin/genVimLatex.sh b/bin/genVimLatex.sh
index 24165f0..5dff670 100755
--- a/bin/genVimLatex.sh
+++ b/bin/genVimLatex.sh
@@ -1,11 +1,13 @@
 #!/bin/bash
 
-# DEPRECATED
+# goto root dir (this script resides in bin)
+BASEDIR=$(dirname $0)
+cd ${BASEDIR}/../
 
 cd vim-latex
 git pull
 make DESTDIR=pkg PREFIX= install
 
-mv pkg/share/vim pkg/.vim
+mv pkg/share/vim ../gen/.vim
 rmdir pkg/share
 
diff --git a/bin/load.sh b/bin/load.sh
index 1a4a88f..31f0652 100755
--- a/bin/load.sh
+++ b/bin/load.sh
@@ -2,34 +2,19 @@
 
 WGET=$(which wget)
 URL="http://pluto.fsinf.at/~astra/config/"
+FILE="skel.tar.gz"
+CLEAN=".vim"
 
-FILES=".hushlogin .Xdefaults .zshrc .zshrc.local .zprofile .muttrc .gitconfig .gitignore .screenrc bin/latextags bin/ltags"
-UNPACK="vim.tar.gz"
-CLEAN=".vim .vimrc"
-DIRECTORIES="bin"
+# fetch file from server
+$WGET -q "${URL}${FILE}"
 
-cd ~
-
-for i in $DIRECTORIES
-do
-	mkdir -p ${i}
-done
-
-# remove local files
-for i in $FILES $UNPACK $CLEAN
-do
-	rm -rf ${i}
-done
+if [ $1 -eq "clean"]; then
+	for i in $CLEAN
+	do
+		echo "rm -rf ${i}"
+	done
+fi
 
-# fetch files from server
-for i in $FILES $UNPACK
-do
-	${WGET} -q ${URL}${i}
-done
-
-# unpack tgz's
-for i in $UNPACK
-do
-	tar xzf ${i}
-	rm ${i}
-done
+cd ~
+tar -xzf $FILE --strip-components=1
+rm $FILE