Merge remote-tracking branch 'origin/develop' into develop

Conflicts: lib/App/perlbrew.pm
gugod · Nov 15, 2014 · 5acfeca · 5acfeca
2 parents dbcbcb7 + f6d904c
commit 5acfeca
Showing 1 changed file with 4 additions and 18 deletions.
diff --git a/lib/App/perlbrew.pm b/lib/App/perlbrew.pm
@@ -2443,12 +2443,7 @@ __perlbrew_reinit() {
 
 __perlbrew_purify () {
     local path patharray outsep
-    if [[ -n "$BASH_VERSION" ]]; then
-        IFS=: read -ra patharray <<< "$1"
-    fi
-    if [[ -n "$ZSH_VERSION" ]]; then
-        IFS=: read -rA patharray <<< "$1"
-    fi
+    IFS=: read -r${BASH_VERSION+a}${ZSH_VERSION+A} patharray <<< "$1"
     for path in "${patharray[@]}" ; do
         case "$path" in
             (*"$PERLBREW_HOME"*) ;;
@@ -2459,7 +2454,7 @@ __perlbrew_purify () {
 }
 
 __perlbrew_set_path () {
-    export MANPATH=$PERLBREW_MANPATH${PERLBREW_MANPATH:+:}$(__perlbrew_purify "$(manpath)")
+    export MANPATH=$PERLBREW_MANPATH${PERLBREW_MANPATH:+:}$(__perlbrew_purify "$(manpath 2>/dev/null)")
     export PATH=${PERLBREW_PATH:-$PERLBREW_ROOT/bin}:$(__perlbrew_purify "$PATH")
     hash -r
 }
@@ -2471,12 +2466,7 @@ __perlbrew_set_env() {
 }
 
 __perlbrew_activate() {
-    if [[ -n "$BASH_VERSION" ]]; then
-        [[ $(type -t perl) == alias ]] && unalias perl 2> /dev/null
-    fi
-    if [[ -n "$ZSH_VERSION" ]]; then
-        [[ -n $(alias perl 2>/dev/null) ]] && unalias perl 2>/dev/null
-    fi
+    [[ -n $(alias perl 2>/dev/null) ]] && unalias perl 2>/dev/null
 
     if [[ -n "$PERLBREW_PERL" ]]; then
         __perlbrew_set_env "$PERLBREW_PERL${PERLBREW_LIB:+@}$PERLBREW_LIB"
@@ -2507,11 +2497,7 @@ perlbrew () {
     case $1 in
         (use)
             if [[ -z "$2" ]] ; then
-                if [[ -z "$PERLBREW_PERL" ]] ; then
-                    echo "Currently using system perl"
-                else
-                    echo "Currently using $PERLBREW_PERL"
-                fi
+                echo "Currently using ${PERLBREW_PERL:-system perl}"
             else
                 __perlbrew_set_env "$2"
                 exit_status="$?"