Merge branch 'master' of holtrop.homelinux.com:files

gentoo-install.txt

@@ -1,18 +1,18 @@
 # Josh's Gentoo Install Guide
-# Last Updated 2010-07-15; last run July 2010
+# Last Updated 2011-04-12; last run April 2011
 
-network: [modprobe], [pcmcia start], [net-setup]
+network: [modprobe], [pcmcia start], [/etc/init.d/net.eth0 start]
-[/etc/init.d/sshd start; passwd; screen] # ssh in, screen -xr to remote setup
-fdisk, mkfs.ext2 for boot, mkfs.ext4 for root/home, mkswap, swapon
-mount root, boot, [home]
 date MMDDhhmmYYYY
+[/etc/init.d/sshd start; passwd; screen] # ssh in, screen -xr to remote setup
+fdisk, mkfs.ext4, mkswap, swapon
+mount root [,boot] [,home]
 cd /mnt/gentoo
 links2 http://www.gentoo.org/main/en/mirrors.xml; #get stage3*bz2
 tar -xvjpf stage?-*.tar.bz2
 [cd /mnt/gentoo/usr]                    # speed up first rsync with
 [tar -xvjpf portage-*.tar.bz2]          # snapshot if slow connection
 nano /mnt/gentoo/etc/make.conf          # FEATURES="parallel-fetch"
-cp /etc/resolv.conf /mnt/gentoo/etc
+cp -L /etc/resolv.conf /mnt/gentoo/etc
 mount -t proc none /mnt/gentoo/proc
 cd /; chroot /mnt/gentoo /bin/bash
 env-update
@@ -24,14 +24,16 @@ emerge -av gentoo-sources syslog-ng vixie-cron grub [slocate] [dhcpcd] [vim]
 cd /usr/src/linux
 make menuconfig
 make && make modules_install
-cp arch/i386/boot/bzImage .config /boot
+cp arch/x86_64/boot/bzImage .config /boot
 vim /etc/fstab
 vim /etc/conf.d/hostname
-vim /etc/conf.d/net                # config_eth0=("dhcp") \n dhcpcd_eth0="-N"
+vim /etc/conf.d/net                     # config_eth0=("dhcp")
 vim /etc/hosts                          # add hostname after localhost
 vim /etc/rc.conf
 vim /etc/modules.autoload.d/kernel-2.6
 vim /etc/conf.d/clock
+vim /etc/locale.gen                     # uncomment en_US*
+vim /etc/etc-update.conf                # remove those pesky -i's
 [cd /etc/init.d; ln -s net.lo net.eth1] # if you have a second NIC
 rc-update show -v
 rc-update add net.eth0 default          # [net.eth1] also for a second NIC
@@ -40,11 +42,12 @@ rc-update add vixie-cron default
 rc-update add numlock default           # unless you're on a laptop :)
 [rc-update add sshd default]            # if you want remote access
 vim /boot/grub/grub.conf
-grub                                    # (root (hd0,0) \n setup (hd0) \n quit)
+grub                                    # root (hd0,0) \n setup (hd0) \n quit
-useradd -m -s /bin/bash john            # omit -m if you have a homedir already
+useradd -m -s /bin/bash john
 passwd
 passwd john
 vim /etc/group
+[emerge -auvDN world; etc-update]       # or update later
 exit
 cd /; umount /mnt/gentoo{/proc,/boot,}
 reboot

gitignore

@@ -0,0 +1,4 @@
+*.pyc
+.*.swp
+*.o
+.sconsign.dblite

install-files

@@ -0,0 +1,23 @@
+#!/bin/sh
+
+here="$(dirname $0)"
+
+function install_file()
+{
+    source="${here}/$1"
+    dest="${HOME}/$2"
+    if [ -f "$dest" ]; then
+        echo "Skipping $1"
+    else
+        echo "Installing $1"
+        mkdir -p $(dirname "$dest")
+        cp "$source" "$dest"
+    fi
+}
+
+install_file bash_aliases .bash_aliases
+install_file vimrc .vimrc
+install_file inputrc .inputrc
+install_file screenrc .screenrc
+install_file ir_black.vim .vim/colors/ir_black.vim
+install_file gitignore .gitignore

jsvn

@@ -30,6 +30,7 @@
 import sys
 import os
 import re
+import time
 from subprocess import *
 
 PATH = os.environ['PATH'].split(os.pathsep)
@@ -180,6 +181,47 @@ def merge(argv, svn):
         root + '/branches/' + argv[1] + path, '.']).wait()
     return 0
 
+def watch_lock(argv, svn):
+    if len(argv) < 2:
+        return -1
+    path = argv[1]
+    if os.path.exists(path):
+        # Get the repository URL of the file being watched
+        p = Popen([svn, 'info', path], stdout=PIPE)
+        lines = p.communicate()[0].split('\n')
+        for line in lines:
+            m = re.match(r'URL: (.*)', line)
+            if m is not None:
+                path = m.group(1)
+                break
+
+    last_lock_owner = ''
+    while 1:
+        lock_owner = ''
+        p = Popen([svn, 'info', path], stdout=PIPE)
+        lines = p.communicate()[0].split('\n')
+        for line in lines:
+            m = re.match(r'Lock\sOwner:\s*(.*)', line)
+            if m is not None:
+                lock_owner = m.group(1)
+                break
+        if lock_owner == '':
+            break
+        if lock_owner != last_lock_owner:
+            sys.stdout.write('Locked by: %s\n' % lock_owner)
+            last_lock_owner = lock_owner
+        time.sleep(60)
+
+    sys.stdout.write('''
+ _   _       _            _            _ _
+| | | |_ __ | | ___   ___| | _____  __| | |
+| | | | '_ \| |/ _ \ / __| |/ / _ \/ _` | |
+| |_| | | | | | (_) | (__|   <  __/ (_| |_|
+ \___/|_| |_|_|\___/ \___|_|\_\___|\__,_(_)
+
+''')
+    return 0
+
 def main(argv):
     realsvn = findInPath('svn')
     colorsvn = findInPath('colorsvn')
@@ -218,6 +260,9 @@ def main(argv):
             sys.stdout.write(getSVNRoot(realsvn) + '\n')
             return 0
 
+        if argv[0] == "watch-lock":
+            return watch_lock(argv, realsvn)
+
         if argv[0] in ('st', 'status', 'log', 'up', 'update') \
             and colorsvn != '':
             realsvn = colorsvn