[33592] branches/release_1_6/base/portmgr/dmg/postflight

[jmpp at macports.org]

Revision: 33592
          http://trac.macosforge.org/projects/macports/changeset/33592
Author:   jmpp at macports.org
Date:     2008-01-30 22:41:05 -0800 (Wed, 30 Jan 2008)

Log Message:
-----------

Revert r33591, I was tired when I wrote it and thougth about cancelling the commit to find a better solution... but then I hit the wrong keys!

Modified Paths:
--------------
    branches/release_1_6/base/portmgr/dmg/postflight

Modified: branches/release_1_6/base/portmgr/dmg/postflight
===================================================================
--- branches/release_1_6/base/portmgr/dmg/postflight	2008-01-31 06:36:50 UTC (rev 33591)
+++ branches/release_1_6/base/portmgr/dmg/postflight	2008-01-31 06:41:05 UTC (rev 33592)
@@ -1,4 +1,4 @@
-#!/bin/bash -l
+#!/bin/bash
 # -*- coding: utf-8; mode: shell-script-mode; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=sh:et:sw=4:ts=4:sts=4
 #
 # Copyright (c) 2002-2007 Juan Manuel Palacios <jmpp at macports.org>, The MacPorts Project.
@@ -32,7 +32,7 @@
 # $Id$
 
 
-#set -x
+set -x
 
 # Script identification ('cause more often than not the svn Id is not expanded):
 VERSION=1.6.1
@@ -90,22 +90,20 @@
     exit 1
 }
 case "${USHELL}" in
-    *csh)
+    tcsh)
         LOGIN_FLAG=""
         ENV_COMMAND="setenv"
         ASSIGN=" "
-        CONF_FILE=cshrc
-        echo "Configuring a csh based shell."
+        CONF_FILE=tcshrc
         ;;
-    *sh)
+    bash)
         LOGIN_FLAG="-l"
         ENV_COMMAND="export"
         ASSIGN="="
         CONF_FILE=profile
-        echo "Configuring a bourne based shell."
         ;;
     *)
-        echo "Unsupported shell ($USHELL)! Please set your MacPorts compatible environment manually."
+        echo "Unknown shell! Please set your MacPorts compatible environment manually."
         update_macports
         exit 0
         ;;

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080130/41f7b26b/attachment.html