# HG changeset patch
# User Edho Arief <edho@myconan.net>
# Date 1343291997 -7200
# Node ID e5cf57bf6b47701f98fe498c181358ba13b241f1
# Parent  bb6ea516f3122c007debda5659d52b13e79632ac# Parent  b25fff40927ce82f50c4a16ebf7b4d5e12922b6c
Merge commit 'd029961' into rhel5

diff -r bb6ea516f312 -r e5cf57bf6b47 bin/ren
--- a/bin/ren	Tue Jul 24 17:56:24 2012 -0400
+++ b/bin/ren	Thu Jul 26 10:39:57 2012 +0200
@@ -28,6 +28,8 @@
   $newname =~ s/(Ending) (\(Clean\)) - 0(\d+)/$1 $3 $2/;
   $newname =~ s/(Opening) (\(Clean\))0(\d+)/$1 $3 $2/;
   $newname =~ s/ A\+Channel / A Channel - Special /;
+  $newname =~ s/ Arcana✴Famiglia / Arcana Famiglia /i;
+  $newname =~ s/ Yuru Yuri♪♪ / Yuru Yuri S2 /i;
   $newname =~ s/\[commie\]/[Commie]/i;
   $newname =~ s/Onii-chan no Koto Nanka Zenzen Suki Janain Dakara ne!! - (\d+) \[Uncut\]/Onii-chan no Koto Nanka Zenzen Suki Janain Dakara ne!! - $1 /;
   $newname =~ s/^(Ayashi no Ceres|Chikyuu Shoujo Arjuna|Futari wa Precure  Splash Star) - (\d+)\[\d+\] - .*(\[DVD\])(\[[^]]+\])(\[[a-f0-9]{8}\]\.[^.]+)$/$4 $1 - $2 $3$5/i;
@@ -315,13 +317,13 @@
   #nothing
   $newname =~ s/(\(|\[) *(divx5\.2|H264 704x400|640x480 DivX511 120fps mp3|640x480 DivX511 mp3|h\.264-Hi10P|720x480|10-?bit|10bit 480p H264|640x360|640x360 H264 AAC|h264\.aac|hi10p|10bit|\d+th Release|x264\.aac|xvid|divx5\.2\.1|divx5\.1|divx5\.05|divx5\.1\.1|h\.?264 AC3|848x480|H264 848x480|h264-480p AAC|h\.264-480p) *(\)|\])//i;
   #dvd
-  $newname =~ s/(\(|\[) *(DVD\]\[1024x576 -|DVD H264 Hi10P 640x480|DVD Hi10P 640x480|DVD-480p-AAC|DVD x264 10-bit AC3|DVD 10bit) *(\)|\])/[DVD]/i;
+  $newname =~ s/(\(|\[) *(DVDRip 640x480|DVDRip h264 640x480 AAC|DVD, 480p|DVD\]\[1024x576 -|DVD H264 Hi10P 640x480|DVD Hi10P 640x480|DVD-480p-AAC|DVD x264 10-bit AC3|DVD 10bit) *(\)|\])/[DVD]/i;
   #dvd again
   $newname =~ s/(\(|\[) *(R2 DVD\.H264\.AC3|DVD H264 720x480|DVD 720x480 x264 FLAC|R1DVD 720x480 x264 AC-3|DVD 712x480 AC-3|DVD 720x480 AC-3|R\d DVD\.H264\.AC3|DVD 1024x576 x264 FLAC|DVD H264 640x480|DVD H264 720x480 AAC|DVD 704x480 H264 AC3|DVD 704x480|DVDRip\.Xvid\.864x480\.Vorbis|DVD H264 848x480|DVD 720x480|DVD H264 720x480|DVD, wmv, mp3) *(\)|\])/[DVD]/i;
   #1080p BD
   $newname =~ s/(\(|\[) *(BD\]\[10bit-1080p-AAC|BDRip 1080p x264 FLAC|BD Hi10P 1920x1080|BD Hi10P 1920x1080 H264 FLAC|BD 1920x1080 x264 Hi10P FLAC|BD 1920x1080 Hi10P|1920x1080 BD AAC|BD\]\[h264-1080p FLAC|BD-h264-10bit-1080p|BD\]\[1080p-FLAC|BD 1080|1920x1080 Hi10p h264 AAC|BD 1920x1080 x264 AAC|BD 1080p Hi10P|BDRip 1080p x264 FLAC|BD-1080p-|BD-1080p-FLAC|1920x1038 Blu-Ray FLAC|1920x1080 Blu-Ray FLAC|1920x1080 h264 BD FLAC|1920x1080 BD|BD\.1080p\.FLAC|BD 1080p H\.264 AAC 5\.1|BD 1080p) *(\)|\])/[1080p BD]/i;
   #720p
-  $newname =~ s/(\(|\[) *(1280x720 x264-Hi10P AAC|AT-X Hi10P 1280x720 H264|AT-X Hi10P 1280x720|1280x720 Hi10p|AT-X Hi10P 1280x720|1280x720 Hi10p AAC|AT-X 1280x720 H264|Hi10P 1280x720 H264|Hi10P 1280x720|1280x720 Hi10P|1280x720 5\.1|1280x720 x264 AAC|1280x720 H264 AAC|720p H264 AAC|1280x720|1280x720 H\.?264 AAC) *(\)|\])/[720p]/i;
+  $newname =~ s/(\(|\[) *(BD 1280x720|1280x720 8bit|1280x720 x264-Hi10P AAC|AT-X Hi10P 1280x720 H264|AT-X Hi10P 1280x720|1280x720 Hi10p|AT-X Hi10P 1280x720|1280x720 Hi10p AAC|AT-X 1280x720 H264|Hi10P 1280x720 H264|Hi10P 1280x720|1280x720 Hi10P|1280x720 5\.1|1280x720 x264 AAC|1280x720 H264 AAC|720p H264 AAC|1280x720|1280x720 H\.?264 AAC) *(\)|\])/[720p]/i;
   #720p BD
   $newname =~ s/(\(|\[) *(BD\]\[720p-|BD, 720p, 10bit, AAC|BDRip 720p x264 FLAC|BDRip 720p|BD 720p DA|Blu-Ray 960x720 Dual Audio FLAC|BD, 720p|BD\]\[h264-720p\]\[FLAC|BD Hi10P 1280x720|BD, 720p, 10bit,|BD, 720, 10bit, AAC|BDrip 720p Vorbis|BD 720p Hi10P AAC|BD, 720p,|BD 720p H264-AAC|BDRip 720p|BD, 720p, ,|1280x720 BD|BD 1280x720 H264 AAC|BD 720p|BD 720p FLAC|BD 1280x720 H264 AAC) *(\)|\])/[720p BD]/i;
   #BD
@@ -477,7 +479,7 @@
   $newname =~ s/ Persona - 3 Picture Drama - She Goes For A Walk / Persona 3 Picture Drama - She Goes For A Walk - /;
   $newname =~ s/ SP0/ - Special /;
   $newname =~ s/ SP(\d+) / - Special $1 /;
-  $newname =~ s/ Special - / - Special /;
+  $newname =~ s/ (Menu|Special) - / - $1 /;
   $newname =~ s/ Animated Commentary - / - Animated Commentary /;
   $newname =~ s/ Fullmetal Alchemist Brotherhood (- |)Skit - / Fullmetal Alchemist Brotherhood - Skit /i;
   $newname =~ s/ - Picture Drama - / - Picture Drama /;
diff -r bb6ea516f312 -r e5cf57bf6b47 rc/bashrc
--- a/rc/bashrc	Tue Jul 24 17:56:24 2012 -0400
+++ b/rc/bashrc	Thu Jul 26 10:39:57 2012 +0200
@@ -13,8 +13,27 @@
 
 [ -f "${HOME}/.ecos_bash.before" ] && . "${HOME}/.ecos_bash.before"
 
+_org_path="${PATH}"
+
+# Basic PATH
+export PATH="${HOME}/.ecos_bin:${HOME}/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
+
+# pkgsrc
+if test -d /usr/pkg; then
+  PATH="${PATH}:/usr/pkg/bin:/usr/pkg/sbin"
+  if test -d /usr/pkg/java/openjdk7; then
+    # OpenJDK 7 in pkgsrc
+    PATH="${PATH}:/usr/pkg/java/openjdk7/bin"
+  fi
+fi
+# OpenBSD X11
+test -d /usr/X11R6/bin && PATH="${PATH}:/usr/X11R6/bin"
+# PostgreSQL Yum
+test -d /usr/pgsql-8.4 && PATH="/usr/pgsql-8.4/bin:${PATH}"
+test -d /usr/pgsql-9.1 && PATH="/usr/pgsql-9.1/bin:${PATH}"
+
 # Nuke currently defined functions
-unset -f $(set | grep -E ' ()$' | cut -d ' ' -f 1)
+unset -f $(set | egrep ' ()$' | cut -d ' ' -f 1)
 
 # Nuke bash-completion
 complete -r
@@ -22,11 +41,6 @@
 # Nuke aliases
 unalias -a
 
-_org_path="${PATH}"
-export PATH="${HOME}/.ecos_bin:${HOME}/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
-# OpenJDK in pkgsrc
-PATH="${PATH}:/usr/pkg/java/openjdk7/bin"
-
 shopt -s histappend
 PROMPT_COMMAND="history -a; history -n"
 export HISTFILESIZE=10000
@@ -105,7 +119,6 @@
     alias top="top -P"
   ;;
   OpenBSD)
-    PATH="${PATH}:/usr/X11R6/bin"
     if command -v gls > /dev/null 2>&1; then
       _has_gnu_ls=y
       _ls="gls"
@@ -114,7 +127,6 @@
     fi
   ;;
   NetBSD|DragonFly)
-    PATH="${PATH}:/usr/pkg/bin:/usr/pkg/sbin"
     if command -v gls > /dev/null 2>&1; then
       _has_gnu_ls=y
       _ls="gls"
diff -r bb6ea516f312 -r e5cf57bf6b47 rc/inputrc
--- a/rc/inputrc	Tue Jul 24 17:56:24 2012 -0400
+++ b/rc/inputrc	Thu Jul 26 10:39:57 2012 +0200
@@ -2,6 +2,9 @@
 set bell-style none
 set keymap emacs
 
+# automatically append / to symlinked directories
+set mark-symlinked-directories on
+
 #Home/End
 #GNOME Terminal
 "\eOH": beginning-of-line