# HG changeset patch
# User Jeff Hammel <jhammel@mozilla.com>
# Date 1288296356 25200
# Node ID 8b15a38ccd0f871962bfa343b65e963d1d268396
# Parent  3016fa6a7c13e988201ca31a0d7adcb125fd82b8
* fix vpns
* create a flatten function

diff -r 3016fa6a7c13 -r 8b15a38ccd0f .bashrc
--- a/.bashrc	Mon Oct 25 08:18:00 2010 -0700
+++ b/.bashrc	Thu Oct 28 13:05:56 2010 -0700
@@ -290,6 +290,28 @@
 echo "default-push = ssh://${ROOT#http*://}"
 }
 
+flatten() {
+  directory=$PWD
+  if [ "$#" == "1" ]
+  then
+      directory=$1
+  fi
+  cd $directory
+  unset find # don't use the alias
+  find -name '*' -type f | sed 's/.\///' | while read line
+  do
+      filename=$(echo $line | sed 's/\//-/g')
+      mv "${line}" "${filename}"
+  done
+  for i in *
+  do
+      if [ -d $i ]
+      then
+          rm -rf "${i}"
+      fi
+  done
+}
+
 ### include overrides for commands
 source ~/.bash_overrides
 
diff -r 3016fa6a7c13 -r 8b15a38ccd0f bin/vpn-mpt.sh
--- a/bin/vpn-mpt.sh	Mon Oct 25 08:18:00 2010 -0700
+++ b/bin/vpn-mpt.sh	Thu Oct 28 13:05:56 2010 -0700
@@ -1,5 +1,5 @@
 #!/bin/bash
 
-sudo openvpn --daemon --config /home/jhammel/mozilla/vpn/MPT-vpn/Mozilla-MPT.ovpn --script-security 3
-sudo openvpn --daemon --config /home/jhammel/mozilla/vpn/Office-vpn/Mozilla-MV-Office.ovpn --script-security 3
+cd /home/jhammel/mozilla/vpn/MPT-vpn/
+sudo openvpn --daemon --config Mozilla-MPT.ovpn --script-security 3
 tail -f /var/log/syslog
\ No newline at end of file
diff -r 3016fa6a7c13 -r 8b15a38ccd0f bin/vpn-office.sh
--- a/bin/vpn-office.sh	Mon Oct 25 08:18:00 2010 -0700
+++ b/bin/vpn-office.sh	Thu Oct 28 13:05:56 2010 -0700
@@ -1,5 +1,5 @@
 #!/bin/bash
 
-sudo openvpn --daemon --config /home/jhammel/mozilla/vpn/MPT-vpn/Mozilla-MPT.ovpn --script-security 3
-sudo openvpn --daemon --config /home/jhammel/mozilla/vpn/Office-vpn/Mozilla-MV-Office.ovpn --script-security 3
+cd /home/jhammel/mozilla/vpn/Office-vpn/
+sudo openvpn --daemon --config Mozilla-MV-Office.ovpn --script-security 3
 tail -f /var/log/syslog
\ No newline at end of file