From e833805d1a66313ed693a801be898b9d15323125 Mon Sep 17 00:00:00 2001 From: Austen Adler Date: Wed, 3 Sep 2014 19:43:00 -0400 Subject: [PATCH] Fixed desktop syncing --- scripts/desktop.txt | 4 +--- scripts/sync.sh | 8 ++++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/scripts/desktop.txt b/scripts/desktop.txt index 78ba0b5..b66a1e6 100644 --- a/scripts/desktop.txt +++ b/scripts/desktop.txt @@ -52,7 +52,5 @@ nitrogen banshee xautolock sqlitebrowser -<<<<<<< Updated upstream tdfsb -======= ->>>>>>> Stashed changes +icedtea-7-plugin diff --git a/scripts/sync.sh b/scripts/sync.sh index 6e16baa..8d988ec 100755 --- a/scripts/sync.sh +++ b/scripts/sync.sh @@ -27,8 +27,8 @@ while getopts ":hbsdtclw" VALUE "$@"; do if [ "$VALUE" = "s" ] ; then if [ "$(uname)" != "Darwin" ]; then echo "Installing server applications:" - echo $(grep -vE "^\s*#" server.txt | tr "\n" " ") - sudo apt-get install $(grep -vE "^\s*#" server.txt | tr "\n" " ") + echo $(grep -vE "^\s*#" $ABSPATH/scripts/server.txt | tr "\n" " ") + sudo apt-get install $(grep -vE "^\s*#" $ABSPATH/scripts/server.txt | tr "\n" " ") else if [ -d "/usr/local/Library/Taps/phinze/homebrew-cask" ] ; then brew tap phinze/cask @@ -41,8 +41,8 @@ while getopts ":hbsdtclw" VALUE "$@"; do if [ "$VALUE" = "d" ] ; then echo "Installing desktop applications" if [ "$(uname)" != "Darwin" ]; then - echo $(grep -vE "^\s*#" server.txt | tr "\n" " ") $(grep -vE "^\s*#" desktop.txt | tr "\n" " ") - sudo apt-get install $(grep -vE "^\s*#" server.txt | tr "\n" " ") $(grep -vE "^\s*#" desktop.txt | tr "\n" " ") + echo $(grep -vE "^\s*#" $ABSPATH/scripts/server.txt | tr "\n" " ") $(grep -vE "^\s*#" $ABSPATH/scripts/desktop.txt | tr "\n" " ") + sudo apt-get install $(grep -vE "^\s*#" $ABSPATH/scripts/server.txt | tr "\n" " ") $(grep -vE "^\s*#" $ABSPATH/scripts/desktop.txt | tr "\n" " ") else brew install autojump ncdu htop vim youtube-dl tree sshfs ircii imagemagick node ffmpeg wget lua libconfig readline meld fi