Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 315 → Rev 320

/bash/install.sh
5,14 → 5,14
 
#set -x
 
if [ "$(echo ${DIR}*)" = "${DIR}"'*' ]
then
# We've been asked to install an empty directory - nothing to do
script=$0
scriptdir=$(dirname ${script})
 
echo "${DIR} is an empty directory"
exit 0;
fi
verbose=false
dry_run=false
 
DIR=${scriptdir}/
 
osName=
case "$(uname)" in
CYGWIN*)
24,72 → 24,97
;;
esac
 
for srcFile in ${DIR}*
do
if [ "${srcFile}" = "install.sh" ]
then
# That's this file - skip it
function InstallDir
{
local srcDir=$1
local dstDir=$2
local srcFile
local dstFile
local srcBase
 
continue
fi
$verbose && echo "InstallDir '${srcDir}' '${dstDir}' ..."
 
# Change files which look like dot-foo to be .foo
if [ "${srcFile:0:4}" = "dot-" ]
then
dstFile=~/.${srcFile:4}
else
dstFile=~/${srcFile}
fi
for srcFile in ${srcDir}/*
do
$verbose && echo "Processing '${srcFile}' ..."
 
# Install the file
srcBase=$(basename ${srcFile})
if [ "${srcBase}" = "install.sh" ]
then
# That's this file - skip it
${verbose} && echo "-- Skipping install.sh"
continue
fi
 
if [ -d ${srcFile} ]
then
#
# We're installing a subdirectory - recurse
#
# Change files which look like dot-foo to be .foo
mkdir -p ${dstFile}
if [ "${srcBase:0:4}" = "dot-" ]
then
dstFile=${dstDir}/.${srcBase:4}
${verbose} && echo " Renaming '${srcFile}' to '${dstFile}'"
else
dstFile=${dstDir}/${srcBase}
fi
 
DIR="${srcFile}/" $0
else
#
# We're installing an individual file - check for os specific variants
#
# Install the file
 
installThisFile=0
case "${srcFile}" in
if [ -d ${srcFile} ]
then
#
# We're installing a subdirectory - recurse
#
mkdir -p ${dstFile}
InstallDir ${srcFile} ${dstFile}
else
#
# We're installing an individual file - check for os specific variants
#
 
*-cygwin.sh)
if [ "${osName}" = "cygwin" ]
then
installThisFile=1
fi
;;
installThisFile=0
case "${srcFile}" in
 
*-linux.sh)
if [ "${osName}" = "linux" ]
then
*-cygwin.sh)
if [ "${osName}" = "cygwin" ]
then
installThisFile=1
dstFile=${dstFile%-cygwin.sh}.sh
fi
;;
 
*-linux.sh)
if [ "${osName}" = "linux" ]
then
installThisFile=1
dstFile=${dstFile%-linux.sh}.sh
fi
;;
 
*)
installThisFile=1
fi
;;
;;
esac
 
*)
installThisFile=1
;;
esac
 
if [ "${installThisFile}" = "1" ]
then
echo "Installing ${srcFile} to ${dstFile} ..."
cp ${srcFile} ${dstFile}
else
echo "Skipping ${srcFile} ..."
if [ "${installThisFile}" = "1" ]
then
echo "Installing '${srcFile}' to '${dstFile}' ..."
! ${dry_run} && cp -p ${srcFile} ${dstFile}
else
echo "Skipping '${srcFile}' ..."
fi
fi
fi
done
done
 
}
 
InstallDir ${scriptdir} ~
 
#
# Now add a call to ~/.startup into .bashrc
#
 
if ! fgrep .startup ~/.bashrc
then
echo "" >> ~/.bashrc
/bash/ubuntu-customizations.sh
2,7 → 2,7
 
echo "Moving min/max/close over to the right..."
 
gconftool-2 --set "/apps/metacity/general/button_layout" --type string "menu:minimize,maximize,close"
#gconftool-2 --set "/apps/metacity/general/button_layout" --type string "menu:minimize,maximize,close"
 
# The following is especially useful if you use VNC
echo "Make the background be a plain color (no image)..."
/bash/bin/git-setup.sh
5,7 → 5,7
set -x
 
git config --global user.name "Dave Hylands"
git config --global user.email "dhylands@broadcom.com"
git config --global user.email "dhylands@gmail.com"
git config --global color.diff auto
git config --global color.status auto
git config --global color.branch auto
/bash/bin/backup.sh
33,7 → 33,7
# These machines are always attached to the network, so don't
# need the wireless check
 
dave-ubuntu)
dave-ubuntu|dave|dave-moz)
CHECK_WIRELESS=0
;;
 
/bash/dot-startup.d/40-ssh-agent-linux.sh
File deleted
/bash/dot-startup.d/40-ssh-agent.sh
0,0 → 1,40
#
# Starts up the ssh agent.
#
# Originally from: http://mah.everybody.org/docs/ssh
#
# Run
#
# ssh-add ~/.ssh/id_dsa
#
# to enter the passphrase and register with the agent.
 
SSH_ENV="$HOME/.ssh/environment"
 
function start_agent {
privkey=~/.ssh/id-rsa-$(hostname)
if [ ! -e "${privkey}" ]
then
echo "Unable to find SSH private key: '${privkey}'"
return
fi
echo "Initialising new SSH agent..."
/usr/bin/ssh-agent | sed 's/^echo/#echo/' > "${SSH_ENV}"
echo succeeded
chmod 600 "${SSH_ENV}"
. "${SSH_ENV}" > /dev/null
/usr/bin/ssh-add ${privkey}
}
 
# Source SSH settings, if applicable
 
if [ -f "${SSH_ENV}" ]; then
. "${SSH_ENV}" > /dev/null
#ps ${SSH_AGENT_PID} doesn't work under cywgin
ps -ef | grep ${SSH_AGENT_PID} | grep ssh-agent$ > /dev/null || {
start_agent;
}
else
start_agent;
fi
 
/bash/ubuntu-12.04-customizations.txt
0,0 → 1,39
Install Indicator Multiload - the equivalent to system monitor from 10.10
 
sudo add-apt-repository ppa:indicator-multiload/stable-daily
sudo apt-get update
sudo apt-get install indicator-multiload
 
The following allows clicking on URLs in thunderbird and having Firefox come to the foreground
sudo apt-get install compizconfig-settings-manager
Compiz Settings Manager > General Options -> Focus & Raise Behaviour, and set the Focus Prevention Level to Off.
 
Install Gnome 3 Desktop
 
sudo add-apt-repository ppa:gnome3-team/gnome3
sudo apt-get update
sudo apt-get install gnome-shell
 
Install System Monitor
 
sudo apt-get install libgtop2-dev
Logout
Login and then install
https://extensions.gnome.org/extension/120/system-monitor/
 
Remove Accessibility menu
https://extensions.gnome.org/extension/112/remove-accesibility/
 
Install Gnome Tweak Tool
sudo apt-get install gnome-tweak-tool
 
Add Advanced Settings to the menu
https://extensions.gnome.org/extension/130/advanced-settings-in-usermenu/
 
Change Shell->Arrangements of buttons on the titlebar to All
 
Install Alternate-Tab
https://extensions.gnome.org/extension/15/alternatetab/
 
Install Alternative Status Menu
https://extensions.gnome.org/extension/5/alternative-status-menu/