From 6291c8031107deefc9758f8a58fe6cefac8f386e Mon Sep 17 00:00:00 2001 From: staticsafe Date: Sun, 5 Feb 2012 19:09:28 -0500 Subject: [PATCH] adding conkyrc url --- envsetup.py | 8 ++++++++ envupdate.sh | 9 +++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/envsetup.py b/envsetup.py index 9a7cdcd..dff97a9 100644 --- a/envsetup.py +++ b/envsetup.py @@ -13,6 +13,7 @@ vimrcurl = "https://raw.github.com/staticsafe/dotfiles/master/.vimrc" zshrcurl = "https://raw.github.com/staticsafe/dotfiles/master/.zshrc" tmuxurl = "https://raw.github.com/staticsafe/dotfiles/master/.tmux.conf" vimdirurl = "http://dl.dropbox.com/u/2888062/vimdir.tar.bz2" +conkyrc = "https://raw.github.com/staticsafe/dotfiles/master/.conkyrc" envupdate = "https://raw.github.com/staticsafe/dotfiles/master/envupdate.sh" def sudocheck(): @@ -55,6 +56,7 @@ def checksandactions(): zshrcdir = os.path.join(os.environ['HOME'], ".zshrc") tmuxconfdir = os.path.join(os.environ['HOME'], ".tmux.conf") vimdir = os.path.join(os.environ['HOME'], ".vim") + conkydir = os.path.join(os.environ['HOME'], ".conkyrc") usershell = os.getenv('SHELL') #checks to prevent clobbering @@ -79,6 +81,11 @@ def checksandactions(): urldownload(confurl = vimdirurl) untar = call("tar pxvf vimdir.tar.bz2 && rm vimdir.tar.bz2", shell = True) + if os.path.isfile(conkydir) == True: + print ".conkyrc already exists, skipping download!" + else: + urldownload(confurl = conkydir) + if usershell == "/bin/zsh": print "Your default shell is already zsh! Skipping." else: @@ -89,6 +96,7 @@ def checksandactions(): #Downloads environment update script urldownload(confurl = envupdate) scriptperm = call("chmod a+x envupdate.sh", shell = True) + def envArch(): sudocheck() #Install relevant packages diff --git a/envupdate.sh b/envupdate.sh index 92069b0..2538ed5 100755 --- a/envupdate.sh +++ b/envupdate.sh @@ -13,11 +13,12 @@ cd # Update all the conf files here printf '%s\n' "Updating dotfiles now!" -wget --no-check-certificate -O .zshrc https://raw.github.com/staticsafe/dotfiles/master/.zshrc -wget --no-check-certificate -O .vimrc https://raw.github.com/staticsafe/dotfiles/master/.vimrc -wget --no-check-certificate -O .tmux.conf https://raw.github.com/staticsafe/dotfiles/master/.tmux.conf +wget --no-check-certificate -O .zshrc https://raw.github.com/staticsafe/dotfiles/master/.zshrc || die 'Download failed!' +wget --no-check-certificate -O .vimrc https://raw.github.com/staticsafe/dotfiles/master/.vimrc || die 'Download failed!' +wget --no-check-certificate -O .tmux.conf https://raw.github.com/staticsafe/dotfiles/master/.tmux.conf || die 'Download failed!' +wget --no-check-certificate -O .conkyrc https://raw.github.com/staticsafe/dotfiles/master/.conkyrc || die 'Download failed!' # vim dir rm -r ~/.vim -wget -O vimdir.tar.bz2 http://dl.dropbox.com/u/2888062/vimdir.tar.bz2 +wget -O vimdir.tar.bz2 http://dl.dropbox.com/u/2888062/vimdir.tar.bz2 || die 'Download failed!' tar xjvf vimdir.tar.bz2 \ No newline at end of file