Fixed desktop syncing

This commit is contained in:
Austen Adler 2014-09-03 19:43:00 -04:00
parent 4d7603b8ab
commit e833805d1a
2 changed files with 5 additions and 7 deletions

View File

@ -52,7 +52,5 @@ nitrogen
banshee banshee
xautolock xautolock
sqlitebrowser sqlitebrowser
<<<<<<< Updated upstream
tdfsb tdfsb
======= icedtea-7-plugin
>>>>>>> Stashed changes

View File

@ -27,8 +27,8 @@ while getopts ":hbsdtclw" VALUE "$@"; do
if [ "$VALUE" = "s" ] ; then if [ "$VALUE" = "s" ] ; then
if [ "$(uname)" != "Darwin" ]; then if [ "$(uname)" != "Darwin" ]; then
echo "Installing server applications:" echo "Installing server applications:"
echo $(grep -vE "^\s*#" server.txt | tr "\n" " ") echo $(grep -vE "^\s*#" $ABSPATH/scripts/server.txt | tr "\n" " ")
sudo apt-get install $(grep -vE "^\s*#" server.txt | tr "\n" " ") sudo apt-get install $(grep -vE "^\s*#" $ABSPATH/scripts/server.txt | tr "\n" " ")
else else
if [ -d "/usr/local/Library/Taps/phinze/homebrew-cask" ] ; then if [ -d "/usr/local/Library/Taps/phinze/homebrew-cask" ] ; then
brew tap phinze/cask brew tap phinze/cask
@ -41,8 +41,8 @@ while getopts ":hbsdtclw" VALUE "$@"; do
if [ "$VALUE" = "d" ] ; then if [ "$VALUE" = "d" ] ; then
echo "Installing desktop applications" echo "Installing desktop applications"
if [ "$(uname)" != "Darwin" ]; then if [ "$(uname)" != "Darwin" ]; then
echo $(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*#" server.txt | tr "\n" " ") $(grep -vE "^\s*#" 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 else
brew install autojump ncdu htop vim youtube-dl tree sshfs ircii imagemagick node ffmpeg wget lua libconfig readline meld brew install autojump ncdu htop vim youtube-dl tree sshfs ircii imagemagick node ffmpeg wget lua libconfig readline meld
fi fi