Playhouse Animation from Richard Bronosky on Vimeo.
# add files to the index which `git status` lists as untracked:
git add $(git status | awk 'p==1{print $2}; /git add /{p=1}')
# remove files from the index which `git status` lists as deleted:
git rm $(git status | awk '$2=="deleted:" && p==1{print $3}; /git add\/rm /{p=1}')
# add files to the index which `git status` lists as ``Changed but not updated``/modified:
git add $(git st | awk '$2=="modified:" && 'p==1{print $3}; /git add /{p=1}')
# checkout the penultimate commit (used for stepping backwards through commit to find the introduction of a bug)
git checkout $(git log | awk '/^commit /{if(i++>0){print $2; exit}}')
# mount cdrom
[ -d "/mnt/cdrom" ] || mkdir -p /mnt/cdrom; mount /dev/cdrom /mnt/cdrom/
# mount a samba/cifs share (hostess is used by vmware in NAT mode)
user=rbronosky; [ -d "/mnt/smb" ] || mkdir -p /mnt/smb; mount -t cifs //hostess/$user -o username=$user /mnt/smb
# remove the leading path from a find
find . | sed 's/^..//'
# basic bash for-looping
for f in $(cat changed_files.txt) ;do vimdiff trunk/$f branches/iteration3/$f; done;
# if you have spaces in filenames
find . -type f |sed 's/^..//'|while read f; do ls "$f"; done
# or
(IFS=$'\n';for f in $(find . -type f) ; do cat ../Logs2/$f $f>../LogsCat/$f; done;)
# version number comparison using the power of the Python standard lib
[ "1" == "$(python -c "from distutils.version import *;print int(LooseVersion('3')>=LooseVersion('2.5.1'))")" ] \
&& echo Yes || echo No
# above is True, below is False...
[ "1" == "$(python -c "from distutils.version import *;print int(LooseVersion('2.3')>=LooseVersion('2.5.1'))")" ] \
&& echo Yes || echo No
# basic anonymous cvs
cvs -z3 -d:pserver:anonymous@iterm.cvs.sourceforge.net:/cvsroot/iterm ls
# make wget use filenames as suggested by the HTTP header Content-Disposition (requires wget>=1.11)
# http://www.vim.org/scripts/download_script.php?src_id=6328 becomes ps_color.vim
echo -e '\ncontent-disposition=on'>>~/.wgetrc
# copy files using ONLY ssh, not scp or sftp
tar cvf - $files_and_dirs_to_send | gzip | ssh $destination_server "cd $destination_dir; tar zxvf -"
# or to leave them compressed on the remote side...
tar cvf - $files_and_dirs_to_send | gzip | ssh $destination_server "cat > $destination_dir\archive.tar.gz"
### Help dad out via ssh (and telephone) ###
## I configure my router to forward $secret_port to port 22 on my machine.
## Because Ubuntu does not default to having and ssh server, I tell dad to do:
sudo apt-get install openssh-server
## I to tell dad to connect to my computer via:
ssh -p $secret_port -R $secret_port:localhost:22 -N $my_username@$my_router_ip & screen; kill %1
## I connect to his computer via:
ssh -v -p $secret_port $dad_username@localhost screen -x
## Now we are both looking at the same shell. We can both type and collaborate.
## Convert/get a date from a timestamp using only Gnu Date
date -d @1199163600
## Sync the date of one server to that of another. (Useful when firewalls prevent you from using NTP.)
sudo date -s "$(ssh user@server.com "date -u")"
## Get 255 random chars from /dev/random
uuencode -m - < /dev/random |sed 1d|tr -d \\n|head -c 255
# That is Base64 [/+a-zA-Z0-9], but you can add a substirution to the sed.
# This one limits it to hex chars:
uuencode -m - < /dev/random |sed '1d;s/[^0-9A-F]//g'|tr -d \\n|head -c 255
# However, for storing into a DB, I like to keep the newlines so:
uuencode -m - < /dev/random |sed 1d|head -c 255
# Time stamp for a file name
date +%s
# a readable one
date +%Y%m%d%H%M%S
First exercise: Let us create our test environment.
mkdir -p difftest/date
date >> difftest/date/time.txt
find difftest > difftest/files.txt
# Okay, no you have a project folder called difftest
cp -r difftest difftest_new
date >> difftest_new/date/time.txt
mkdir difftest_new/files
mv difftest_new/files.txt difftest_new/files/list.txt
# Now we have made a few modifications to new revision called difftest_new
# Lets not touch the original project folder. We will make a copy to hack on.
cp -r difftest difftest-to-be-patched
# The following command creates a patch
diff -ruN difftest difftest_new > difftest-to-difftest_new.patch
# That is it. You have a patch file that you can share with anyone without embarrassment.
# Note: It is customary to create the patch from the parent folder of both the old and
# new folders. It is bad form to create the patch from either of those folders
# with ../path to get to the other.
# A customary diff patch can be with -p1 which strips the first dir off the path
patch -E -p1 -d difftest-to-be-patched < difftest-to-difftest_new.patch
# The -E is not important here, but it is needed for patches created by svn. I suggest you
# always use it.
# The following command will tell you 2 directories are identical. You just have to trust me.
# We will use this more later.
diff -r difftest_new difftest-to-be-patched
# You want it to return nothing. (It is a diff command, not a same command.)
Second exercise: Let's put our test into an svn repo and create the patch from there.
# These steps assume you have completed the steps above.
svnadmin create repo
svn mkdir file://$PWD/repo/tags -m 'initial setup'
svn import -m "initial import" difftest file://$PWD/repo/trunk
# Now we have our original project in a new local repo
svn copy file://$PWD/repo/trunk file://$PWD/repo/tags/release1 -m "deployed $(date)"
# Now we have it tagged
# We will make the same changes to trunk that we made in the first exercise.
svn checkout file://$PWD/repo/trunk
date >> trunk/date/time.txt
mkdir trunk/files
mv trunk/files.txt trunk/files/list.txt
svn add trunk/files
svn remove trunk/files.txt
svn commit trunk -m "new"
# Changes are made and commited
svn copy file://$PWD/repo/trunk file://$PWD/repo/tags/release2 -m "deployed $(date)"
# Now we have this one tagged
# Just to prove that you do not need to have a local copy of the code to do this...
rm -rf trunk
# You can create a patch that would bring release1 up to release2 like so...
svn diff file://$PWD/repo/tags/release1 file://$PWD/repo/tags/release2 > release1-to-release2.patch
# So, if your client has release1... created like so...
svn export file://$PWD/repo/tags/release1
# You can tell them to apply the patch like so...
patch -d release1 -p0 -E < release1-to-release2.patch
# I can prove it to you like so...
svn export file://$PWD/repo/tags/release2
diff -r release1 release2
# Again, you have to trust that diff works.
# Finally, if you do not have tags to work with you can do a similar thing with revision numbers
svn diff -r2:4 file://$PWD/repo/trunk > revision2-to-revision4.patch
# That patch is functionally identical to release1-to-release2.patch
# To discover which -r range to use, examine: svn log file://$PWD/repo/trunk
