/opt/local/etc/bash_completion.d/git-completion

Import that code into your .bash_profile and then add in the code necessary to append the branch name output:

. /opt/local/etc/bash_completion.d/git-completion
PS1='\h:\W$(__git_ps1 "(%s)") \u\$ '

You’re done. If you’re getting the “command not found” error after restarting the terminal, be sure your completion file is in the right spot.

If you want to color things a bit, you could change it to one of the options below:

RED="\[\033[0;31m\]"
GREEN="\[\033[0;32m\]"
YELLOW="\[\033[0;33m\]"
BLUE="\[\033[0;34m\]"
PURPLE="\[\033[0;35m\]"
TEAL="\[\033[0;36m\]"
GRAY="\[\033[0;37m\]"
WHITE="\[\033[0;38m\]"
PS1="$TEAL\h: $GRAY\W$GREEN \$(__git_ps1 '(%s)')$WHITE \$ "


A ton of different ways can be found here:
http://asemanfar.com/Current-Git-Branch-in-Bash-Prompt

Note: Since this requires compiling, you must have the developer tools installed. Download and install the Xcode package from Apple.

$ ./configure --prefix=/opt/git
$ make
$ sudo make install

Now that it’s installed, you need to make sure it’s in your path. Add the following content your bash profile:

$ vi ~/.bash_profile
export PATH=${PATH}:/opt/git/bin

Restart terminal and you should see the manual for git when you run the git command.

The clicking and scrolling work just as I expected and after re-watching the video the two-finger-swipe worked as well. Using it as a web browser back/forward button is going to be very useful.

I installed the MagicPrefs tool and immediately added some functionality – tapping the apple logo stem now shows me the spaces menu, and a three-finger click now reveals the desktop.

After using it for a good week I still enjoy it, but I have a better idea of where it’s weaker. I had to deactivate a custom three-finger trigger because it kept activating when it wasn’t intended. I assume it was simply the way I click or rest my hand.

Pros:

• Flawless 360 degree scrolling, no ball/dirt to get in the way.
• Very smooth and easy to keep clean.
• Wireless connection works well.
• Two-finger swipe motion works well, when I use it.

Cons:

• Too sensitive when you rest part of your hand on it. I’ve accidentally scrolled away when I didn’t intend to.
• No left/middle/right tactile feedback. I constantly do a “middle click” rather than a “left click” because I was unaware that the mouse shifted position in my hand.
• Two-finger swipe is hard to adjust to while keeping your hand still.

I’m still learning to adjust so I’m sure things will become easier over time. I used to complain about some caps lock difficulty when I first switched from PC but that’s completely disappeared. Over all I enjoy it – a mouse that has the scrolling I really want without the moving parts that are too sensitive to dirt.

However, when running a php script from the command line I was getting an error:

Warning: mysql_connect(): Can't connect to local MySQL server through socket '/var/mysql/mysql.sock' (2)

After spending some time thinking it was the code, I discovered that the mysql.sock file was missing.

Others on the net found the file elsewhere, like /private/tmp/mysql.sock or /tmp/mysql.sock but I had absolutely no .sock file anywhere.

Turns out, it did exist, but was named differently. According to the php.ini, the file was located at

/usr/local/mysql/run/mysql_socket

So, the solution was to create a symlink in /var/mysql to the proper file.

sudo ln -s /usr/local/mysql/run/mysql_socket /var/mysql/mysql.sock

I’ve grown used to developing on windows so things have been a little slow, but I’m gradually adjusting to using a mac. I’ve already moved my dev server and my subversion server to this machine so I’ve brought the old system home for triage. Eventually, it will allow me work from home whenever I need to, and it allows us to play games again.

Two of our other systems are now up for sale on craigslist/ebay.

So far though, I’m doing just fine and am enjoying the new system. It’s much cleaner, more intuitive, etc.

In order to get support for mysql as well as tools necessary for compiling, you need to install the apple developer tools. Check your original mac disc as you may already have a copy.

Anyway, on with our install:

Apache

First, download the latest version of the apache httpd web server.

./configure --prefix=/usr/local/apache --enable-module=so --enable-module=rewrite

Then, run the standard make, sudo make install.

MySQL

Then download the latest mysql source file. Make sure you download the source “Compressed GNU TAR archive (tar.gz)” as we’ll need to custom compile it.

However, PHP5 no longer includes mysql shared libraries needed during the configure process. To get these, download the source file for the mysql version you just installed. Once downloaded, decompress it and run the following:

./configure --prefix=/usr/local/mysql --with-unix-socket-path=/usr/local/mysql/run/mysql_socket --with-mysqld-user=mysql --with-comment --with-debug

make

sudo make install

sudo /usr/local/mysql/bin/mysql_install_db --force

sudo mkdir /usr/local/mysql/run
sudo mkdir /usr/local/mysql/data

sudo chgrp -R mysql /usr/local/mysql

sudo chown -R mysql /usr/local/mysql/run /usr/local/mysql/var /usr/local/mysql/data

Then start the server with:

sudo /usr/local/mysql/bin/mysqld_safe --user=mysql &

zlib

Then, install zlib if it’s not already installed on your system. Download zlib, and it should be a basic ./configure, make, sudo make install process.

Once zlib is installed, make sure you know the path as we’ll need it during the php configure process.

PHP

Next, download the latest php package. Decompress it, and now we’re ready to configure.

./configure --prefix=/usr/local/apache --enable-cli --with-mysql=/usr/local/mysql --with-zlib-dir=/usr/local --with-apxs2=/usr/local/apache/bin/apxs

Then, run make and sudo make install to complete the process.

Restart apache and test everything out. If php didn’t do it automatically, add in AddType application/x-httpd-php .php to your httpd.conf file – commonly located in /usr/local/apache/conf/httpd.conf.

Then, start your webserver.

sudo /usr/local/apache/bin/apachectl start

And finally, once everything is done you’ll want to setup your account to properly allow access to mysql and apache commands. Just run the following to add their paths to your bash profile:

echo 'export PATH=/usr/local/mysql/bin:$PATH' >> ~/.bash_profile
echo 'export PATH=/usr/local/apache/bin:$PATH' >> ~/.bash_profile

On the existing repository machine, run:

svnadmin dump /path/to/repository > repository-name.dmp

Transfer your dump file to the new machine and then, create a repository. Once subversion is running and you have your repository created, import the dump file:

svnadmin load /path/to/repository-name< /path/to/repository-name.dmp

You're done!

You’ll need to setup at least one repository. I’m going to need multiple repositories that I can use for different clients so I have a bit of extra admin work ahead of me. You can setup as many repositories as you need, but no matter what you’ll need at least one. Here create the folders…

# mkdir /svn
# mkdir /svn/repos

Then we need to tell subversion to make our first repository.

# svnadmin create /svn/repos/myproject

First, I need to setup a config file for svnserve.

# vi /svn/repos/conf/svnserve.conf

Then, look for variations of the following code and edit it as necessary. By default any anonymous user can access the code so to disable that you must include anon-access = none, just commenting the value out will not prevent anonymous access.

anon-access = none
password-db = passwdfile
realm = My SVN Repository
auth-access = write

The password-db is just a path to a file containing usernames and passwords. You’ll create this file especially for SVN. I create each file inside of the repository conf directory. So, save your changes and then we’ll create said user file.

# vi passwdfile

Enter in something like:

[users]
username = password

Anyway, you’ll need to start the svn server.

# svnserve -d --listen-port=3690

One side note – svnserve just runs and doesn’t have a way to stop besides killing the process. If you make changes to the svnserve.conf or user file you’ll need to restart svnserve.

# killall svnserve

Then, go ahead and test (best to do so on a different machine).

# svn co --username=myusername svn://mydomain/svn/repos/myproject


The system should then ask you for your password. Go ahead and run some tests.