[CalendarServer-changes] [12944] CalendarServer/trunk/bin

source_changes at macosforge.org source_changes at macosforge.org
Tue Mar 18 12:07:58 PDT 2014


Revision: 12944
          http://trac.calendarserver.org//changeset/12944
Author:   wsanchez at apple.com
Date:     2014-03-18 12:07:58 -0700 (Tue, 18 Mar 2014)
Log Message:
-----------
/bin/sh
offset=2

Modified Paths:
--------------
    CalendarServer/trunk/bin/caldavd
    CalendarServer/trunk/bin/develop
    CalendarServer/trunk/bin/environment
    CalendarServer/trunk/bin/install_pip
    CalendarServer/trunk/bin/pyflakes
    CalendarServer/trunk/bin/python
    CalendarServer/trunk/bin/run
    CalendarServer/trunk/bin/sim
    CalendarServer/trunk/bin/test
    CalendarServer/trunk/bin/testserver
    CalendarServer/trunk/bin/trial
    CalendarServer/trunk/bin/twistd

Modified: CalendarServer/trunk/bin/caldavd
===================================================================
--- CalendarServer/trunk/bin/caldavd	2014-03-18 18:47:39 UTC (rev 12943)
+++ CalendarServer/trunk/bin/caldavd	2014-03-18 19:07:58 UTC (rev 12944)
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
 # -*- sh-basic-offset: 2 -*-
 
 ##

Modified: CalendarServer/trunk/bin/develop
===================================================================
--- CalendarServer/trunk/bin/develop	2014-03-18 18:47:39 UTC (rev 12943)
+++ CalendarServer/trunk/bin/develop	2014-03-18 19:07:58 UTC (rev 12944)
@@ -1,4 +1,5 @@
 #!/bin/sh
+# -*- sh-basic-offset: 2 -*-
 
 ##
 # Copyright (c) 2005-2014 Apple Inc. All rights reserved.

Modified: CalendarServer/trunk/bin/environment
===================================================================
--- CalendarServer/trunk/bin/environment	2014-03-18 18:47:39 UTC (rev 12943)
+++ CalendarServer/trunk/bin/environment	2014-03-18 19:07:58 UTC (rev 12944)
@@ -1,4 +1,5 @@
 #!/bin/sh
+# -*- sh-basic-offset: 2 -*-
 
 ##
 # Copyright (c) 2005-2014 Apple Inc. All rights reserved.

Modified: CalendarServer/trunk/bin/install_pip
===================================================================
--- CalendarServer/trunk/bin/install_pip	2014-03-18 18:47:39 UTC (rev 12943)
+++ CalendarServer/trunk/bin/install_pip	2014-03-18 19:07:58 UTC (rev 12944)
@@ -1,4 +1,5 @@
 #!/bin/sh
+# -*- sh-basic-offset: 2 -*-
 
 ##
 # Copyright (c) 2013-2014 Apple Inc. All rights reserved.

Modified: CalendarServer/trunk/bin/pyflakes
===================================================================
--- CalendarServer/trunk/bin/pyflakes	2014-03-18 18:47:39 UTC (rev 12943)
+++ CalendarServer/trunk/bin/pyflakes	2014-03-18 19:07:58 UTC (rev 12944)
@@ -1,4 +1,5 @@
 #!/bin/sh
+# -*- sh-basic-offset: 2 -*-
 
 ##
 # Copyright (c) 2005-2014 Apple Inc. All rights reserved.

Modified: CalendarServer/trunk/bin/python
===================================================================
--- CalendarServer/trunk/bin/python	2014-03-18 18:47:39 UTC (rev 12943)
+++ CalendarServer/trunk/bin/python	2014-03-18 19:07:58 UTC (rev 12944)
@@ -1,4 +1,5 @@
 #!/bin/sh
+# -*- sh-basic-offset: 2 -*-
 
 ##
 # Copyright (c) 2005-2014 Apple Inc. All rights reserved.

Modified: CalendarServer/trunk/bin/run
===================================================================
--- CalendarServer/trunk/bin/run	2014-03-18 18:47:39 UTC (rev 12943)
+++ CalendarServer/trunk/bin/run	2014-03-18 19:07:58 UTC (rev 12944)
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
 # -*- sh-basic-offset: 2 -*-
 
 ##
@@ -110,10 +110,10 @@
       'p')
         do_get="false"; do_setup="false"; run="false"; print_path="true";
         ;;
-      'e')
-        do_get="false"; do_setup="false"; run="false"; print_path="true";
-        print_environment="true";
-        ;;
+      # 'e')
+      #   do_get="false"; do_setup="false"; run="false"; print_path="true";
+      #   print_environment="true";
+      #   ;;
       # 'i')
       #   do_get="true";
       #   do_setup="true";
@@ -218,6 +218,10 @@
     exit $?;
   fi;
 
+  if "${print_path}"; then
+    exec "${wd}/bin/environment" PYTHONPATH;
+  fi;
+
   # About to do something for real; let's enumerate (and depending on options,
   # possibly download and/or install) the dependencies.
 
@@ -245,17 +249,6 @@
     fi;
   fi;
 
-  # Now that all the dependencies are set up, let's see if we're just being
-  # asked to print the path.
-  if "${print_path}"; then
-    if "${print_environment}"; then
-      ${python} -c "import os; print repr(dict(os.environ))"
-    else
-      echo "${PYTHONPATH}";
-    fi;
-    exit 0;
-  fi;
-
   # # If we're installing, install the calendar server itself.
   # py_install "Calendar Server" "${wd}";
 

Modified: CalendarServer/trunk/bin/sim
===================================================================
--- CalendarServer/trunk/bin/sim	2014-03-18 18:47:39 UTC (rev 12943)
+++ CalendarServer/trunk/bin/sim	2014-03-18 19:07:58 UTC (rev 12944)
@@ -1,4 +1,5 @@
 #!/bin/sh
+# -*- sh-basic-offset: 2 -*-
 
 ##
 # Copyright (c) 2005-2014 Apple Inc. All rights reserved.

Modified: CalendarServer/trunk/bin/test
===================================================================
--- CalendarServer/trunk/bin/test	2014-03-18 18:47:39 UTC (rev 12943)
+++ CalendarServer/trunk/bin/test	2014-03-18 19:07:58 UTC (rev 12944)
@@ -1,4 +1,5 @@
 #!/bin/sh
+# -*- sh-basic-offset: 2 -*-
 
 ##
 # Copyright (c) 2005-2014 Apple Inc. All rights reserved.

Modified: CalendarServer/trunk/bin/testserver
===================================================================
--- CalendarServer/trunk/bin/testserver	2014-03-18 18:47:39 UTC (rev 12943)
+++ CalendarServer/trunk/bin/testserver	2014-03-18 19:07:58 UTC (rev 12944)
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash
+#!/bin/sh
+# -*- sh-basic-offset: 2 -*-
 
 ##
 # Copyright (c) 2005-2014 Apple Inc. All rights reserved.

Modified: CalendarServer/trunk/bin/trial
===================================================================
--- CalendarServer/trunk/bin/trial	2014-03-18 18:47:39 UTC (rev 12943)
+++ CalendarServer/trunk/bin/trial	2014-03-18 19:07:58 UTC (rev 12944)
@@ -1,4 +1,5 @@
 #!/bin/sh
+# -*- sh-basic-offset: 2 -*-
 
 ##
 # Copyright (c) 2005-2014 Apple Inc. All rights reserved.

Modified: CalendarServer/trunk/bin/twistd
===================================================================
--- CalendarServer/trunk/bin/twistd	2014-03-18 18:47:39 UTC (rev 12943)
+++ CalendarServer/trunk/bin/twistd	2014-03-18 19:07:58 UTC (rev 12944)
@@ -1,4 +1,5 @@
 #!/bin/sh
+# -*- sh-basic-offset: 2 -*-
 
 ##
 # Copyright (c) 2005-2014 Apple Inc. All rights reserved.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140318/3df481f3/attachment.html>


More information about the calendarserver-changes mailing list