Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

fixed fu.sh conflict

  • Loading branch information...
commit b1fdc668d7303d3799179e9d723bf6f90dcc63ae 2 parents 3a0165a + c036848
@DungFu authored
View
11 lib/installs/fu.sh
@@ -1,6 +1,13 @@
+<<<<<<< HEAD
#!/bin/bash
# Install fu
+# https://github.com/samirahmed/fu
+# A simple commandline utility for querying commandlinefu.com
+#
+# CommandlineFu.com is an awesome website written by David Winterbottom
+# It has a collection of neat commandline one liners for the unix shell
+
logfile=/dev/null
echo "Installing Dependencies..."
@@ -11,7 +18,7 @@ mkdir ~/fu/ &> $logfile
unzip -o ~/Downloads/fu-installer.zip -d ~/fu/ &> $logfile
rm ~/Downloads/fu-installer.zip &> $logfile
-cd ~/fu/ &> $logfile
+pushd ~/fu/ &> $logfile
sudo make install &> $logfile
-cd ~ &> $logfile
+popd &> $logfile
rm -rf ~/fu/ &> $logfile
View
2  lib/macinstalls/install_adium.sh
@@ -1,6 +1,6 @@
check_homebrew
check_wget
-check_app Adium
+check_app "Adium"
#Todo: Have it install the latest version.
if [ "$HAVEHOMEBREW" == 1 ]; then
View
2  lib/macinstalls/install_homebrew.sh
@@ -5,5 +5,5 @@ if [ "$HAVEHOMEBREW" == 1 ]; then
return
else
echo "Installing Homebrew!"
- /usr/bin/ruby -e "$(curl -fsSL https://raw.github.com/gist/323731)"
+ /usr/bin/ruby -e "$(/usr/bin/curl -fksSL https://raw.github.com/mxcl/homebrew/master/Library/Contributions/install_homebrew.rb)"
fi
View
2  lib/macinstalls/install_libreoffice.sh
@@ -1,6 +1,6 @@
check_homebrew
check_wget
-check_app "LibreOfficezzz"
+check_app "LibreOffice"
#wget http://www.dropbox.com/downloading?os=lnx -O ~/Downloads/dropbox-index.html
#VALLSTABLE=`egrep -o "nautilus-dropbox_[[:digit:]]{0,9}*\.[[:digit:]]{0,9}*\.[[:digit:]]{0,9}*_${VER}\.deb" ~/Downloads/dropbox-index.html`
View
30 lib/macinstalls/install_sublime.sh
@@ -0,0 +1,30 @@
+check_homebrew
+check_wget
+check_app "Sublimezzz"
+
+#wget http://www.dropbox.com/downloading?os=lnx -O ~/Downloads/dropbox-index.html
+#VALLSTABLE=`egrep -o "nautilus-dropbox_[[:digit:]]{0,9}*\.[[:digit:]]{0,9}*\.[[:digit:]]{0,9}*_${VER}\.deb" ~/Downloads/dropbox-index.html`
+#echo "${VALLSTABLE}"
+#VERNUM=`echo "${VALLSTABLE}"|cut -d "_" -f 2`
+
+if [ "$HAVEHOMEBREW" == 1 ]; then
+ if [ "$HAVEWGET" == 1 ]; then
+ if [ "$HAVEAPP" == 0 ]; then
+ wget http://www.sublimetext.com/2 -O ~/Downloads/sublime-index.html
+ VALLSTABLE=`egrep -o "Beta</a> is [0-9]*" ~/Downloads/sublime-index.html | tail -1`
+ echo ${VALLSTABLE}
+ wget "http://c758482.r82.cf2.rackcdn.com/Sublime Text 2 Build ${VALLSTABLE}.dmg" -O ~/Downloads/Sublime.dmg
+ #hdiutil mount -quiet ~/Downloads/LibreOffice.dmg
+ #cp -R "/Volumes/LibreOffice/LibreOffice.app" /Applications
+ #hdiutil unmount -quiet "/Volumes/LibreOffice"
+ #rm ~/Downloads/LibreOffice.dmg
+ #rm ~/Downloads/libreoffice-index.html
+ else
+ echo "You already have Sublime installed."
+ fi
+ else
+ echo "You should install wget first..."
+ fi
+else
+ echo "You should install Homebrew first..."
+fi
Please sign in to comment.
Something went wrong with that request. Please try again.