brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rich...@apache.org
Subject [51/59] [abbrv] git commit: Moved #!/bin/bash to the start of bash scripts (added where missing
Date Wed, 09 Jul 2014 09:33:55 GMT
Moved #!/bin/bash to the start of bash scripts (added where missing


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/6fab1a49
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/6fab1a49
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/6fab1a49

Branch: refs/heads/master
Commit: 6fab1a496868f468d99bf60b54b6f22ae772bfe7
Parents: 89d552f
Author: Martin Harris <github@nakomis.com>
Authored: Fri Jul 4 12:15:06 2014 +0100
Committer: Martin Harris <github@nakomis.com>
Committed: Fri Jul 4 13:39:17 2014 +0100

----------------------------------------------------------------------
 core/src/main/resources/brooklyn/location/basic/os-details.sh    | 2 +-
 docs/_javadoc/make-javadoc.sh                                    | 1 +
 docs/_javadoc/quick-make-few-javadoc.sh                          | 1 +
 docs/_scripts/build.sh                                           | 2 +-
 docs/_scripts/jekyll-debug.sh                                    | 2 +-
 examples/global-web-fabric/resources/vmc-delete-all.sh           | 2 +-
 examples/simple-nosql-cluster/src/main/assembly/scripts/start.sh | 2 +-
 examples/simple-web-cluster/src/main/assembly/scripts/start.sh   | 2 +-
 .../jclouds/src/main/resources/sample/script/setup-server.sh     | 3 ++-
 .../dropwizard/samples/AppByType_WebClusterDatabaseExample.sh    | 1 +
 sandbox/examples/src/main/scripts/create-all-instances.sh        | 2 +-
 sandbox/examples/src/main/scripts/create-instance.sh             | 2 +-
 sandbox/examples/src/main/scripts/run-at-instances.sh            | 4 ++--
 sandbox/examples/src/main/scripts/stop-instances.sh              | 4 ++--
 usage/all/start-mgmt-web.sh                                      | 2 +-
 .../src/brooklyn-sample/src/main/assembly/scripts/start.sh       | 2 +-
 usage/qa/start-monitor.sh                                        | 2 +-
 usage/qa/start-webcluster.sh                                     | 2 +-
 usage/scripts/change-version.sh                                  | 2 +-
 usage/scripts/grep-in-poms.sh                                    | 2 +-
 20 files changed, 23 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6fab1a49/core/src/main/resources/brooklyn/location/basic/os-details.sh
----------------------------------------------------------------------
diff --git a/core/src/main/resources/brooklyn/location/basic/os-details.sh b/core/src/main/resources/brooklyn/location/basic/os-details.sh
index 29fdb73..8021516 100755
--- a/core/src/main/resources/brooklyn/location/basic/os-details.sh
+++ b/core/src/main/resources/brooklyn/location/basic/os-details.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
@@ -16,7 +17,6 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-#!/bin/bash
 # /etc/os-release is the new-ish standard for specifying OS details.
 # See http://www.freedesktop.org/software/systemd/man/os-release.html.
 # There are a multitude of system-dependent files we can check (see list 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6fab1a49/docs/_javadoc/make-javadoc.sh
----------------------------------------------------------------------
diff --git a/docs/_javadoc/make-javadoc.sh b/docs/_javadoc/make-javadoc.sh
index 4f0e541..ed2c7dd 100755
--- a/docs/_javadoc/make-javadoc.sh
+++ b/docs/_javadoc/make-javadoc.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6fab1a49/docs/_javadoc/quick-make-few-javadoc.sh
----------------------------------------------------------------------
diff --git a/docs/_javadoc/quick-make-few-javadoc.sh b/docs/_javadoc/quick-make-few-javadoc.sh
index 09a56c4..aba9dad 100755
--- a/docs/_javadoc/quick-make-few-javadoc.sh
+++ b/docs/_javadoc/quick-make-few-javadoc.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6fab1a49/docs/_scripts/build.sh
----------------------------------------------------------------------
diff --git a/docs/_scripts/build.sh b/docs/_scripts/build.sh
index 3691f41..7ce5554 100755
--- a/docs/_scripts/build.sh
+++ b/docs/_scripts/build.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
@@ -16,7 +17,6 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-#!/bin/bash
 # this generates the site in _site
 # override --url /myMountPoint  (as an argument to this script) if you don't like the default
set in /_config.yml
 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6fab1a49/docs/_scripts/jekyll-debug.sh
----------------------------------------------------------------------
diff --git a/docs/_scripts/jekyll-debug.sh b/docs/_scripts/jekyll-debug.sh
index 3db704d..93dabf4 100755
--- a/docs/_scripts/jekyll-debug.sh
+++ b/docs/_scripts/jekyll-debug.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
@@ -16,7 +17,6 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-#!/bin/bash
 
 # launches jekyll as a server at the / location, for easy debug
 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6fab1a49/examples/global-web-fabric/resources/vmc-delete-all.sh
----------------------------------------------------------------------
diff --git a/examples/global-web-fabric/resources/vmc-delete-all.sh b/examples/global-web-fabric/resources/vmc-delete-all.sh
index 256b888..f90ce02 100755
--- a/examples/global-web-fabric/resources/vmc-delete-all.sh
+++ b/examples/global-web-fabric/resources/vmc-delete-all.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
@@ -16,7 +17,6 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-#!/bin/bash
 
 # deletes all vmc applications against the current target (if no args) or against all targets
specified
 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6fab1a49/examples/simple-nosql-cluster/src/main/assembly/scripts/start.sh
----------------------------------------------------------------------
diff --git a/examples/simple-nosql-cluster/src/main/assembly/scripts/start.sh b/examples/simple-nosql-cluster/src/main/assembly/scripts/start.sh
old mode 100644
new mode 100755
index 5e1af9a..7efbfa0
--- a/examples/simple-nosql-cluster/src/main/assembly/scripts/start.sh
+++ b/examples/simple-nosql-cluster/src/main/assembly/scripts/start.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
@@ -16,7 +17,6 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-#!/bin/bash
 
 if [ ! -z "$JAVA_HOME" ] ; then 
     JAVA=$JAVA_HOME/bin/java

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6fab1a49/examples/simple-web-cluster/src/main/assembly/scripts/start.sh
----------------------------------------------------------------------
diff --git a/examples/simple-web-cluster/src/main/assembly/scripts/start.sh b/examples/simple-web-cluster/src/main/assembly/scripts/start.sh
index 3989f25..a4cf2d4 100755
--- a/examples/simple-web-cluster/src/main/assembly/scripts/start.sh
+++ b/examples/simple-web-cluster/src/main/assembly/scripts/start.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
@@ -16,7 +17,6 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-#!/bin/bash
 
 if [ -z "$BROOKLYN_APP_CLASS" ] ; then 
     BROOKLYN_APP_CLASS=brooklyn.demo.WebClusterDatabaseExample

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6fab1a49/locations/jclouds/src/main/resources/sample/script/setup-server.sh
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/main/resources/sample/script/setup-server.sh b/locations/jclouds/src/main/resources/sample/script/setup-server.sh
old mode 100644
new mode 100755
index 3968043..d540ccb
--- a/locations/jclouds/src/main/resources/sample/script/setup-server.sh
+++ b/locations/jclouds/src/main/resources/sample/script/setup-server.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
@@ -27,4 +28,4 @@ if [ $OS = "CentOS" -a $OS_MAJOR -eq 6 ]; then
     sudo -s -- '/bin/echo options single-request-reopen >> /etc/resolv.conf'
 fi
 echo Changing default gateway to ${defaultGateway}
-sudo -s -- '/sbin/ip route replace default via ${defaultGateway} dev eth0'
\ No newline at end of file
+sudo -s -- '/sbin/ip route replace default via ${defaultGateway} dev eth0'

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6fab1a49/sandbox/dropwizard/samples/AppByType_WebClusterDatabaseExample.sh
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/samples/AppByType_WebClusterDatabaseExample.sh b/sandbox/dropwizard/samples/AppByType_WebClusterDatabaseExample.sh
index a5b3dd8..fe8a2ec 100755
--- a/sandbox/dropwizard/samples/AppByType_WebClusterDatabaseExample.sh
+++ b/sandbox/dropwizard/samples/AppByType_WebClusterDatabaseExample.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6fab1a49/sandbox/examples/src/main/scripts/create-all-instances.sh
----------------------------------------------------------------------
diff --git a/sandbox/examples/src/main/scripts/create-all-instances.sh b/sandbox/examples/src/main/scripts/create-all-instances.sh
index be36e8a..946ca3f 100755
--- a/sandbox/examples/src/main/scripts/create-all-instances.sh
+++ b/sandbox/examples/src/main/scripts/create-all-instances.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
@@ -16,7 +17,6 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-#!/bin/bash -x
 # Creates an instance in each of the given regions.
 # Must supply the directory with the ssh-key that aws generated for that region,
 # and optionally supply a public key to be added to ~/.ssh/authorized_keys on the created
instance

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6fab1a49/sandbox/examples/src/main/scripts/create-instance.sh
----------------------------------------------------------------------
diff --git a/sandbox/examples/src/main/scripts/create-instance.sh b/sandbox/examples/src/main/scripts/create-instance.sh
index 3f14a1c..3ea6904 100755
--- a/sandbox/examples/src/main/scripts/create-instance.sh
+++ b/sandbox/examples/src/main/scripts/create-instance.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
@@ -16,7 +17,6 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-#!/bin/bash
 # Creates an instance in each of the given region.
 # Must supply the ami to use,
 # the region,

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6fab1a49/sandbox/examples/src/main/scripts/run-at-instances.sh
----------------------------------------------------------------------
diff --git a/sandbox/examples/src/main/scripts/run-at-instances.sh b/sandbox/examples/src/main/scripts/run-at-instances.sh
index 01fe8f2..a6fffbf 100755
--- a/sandbox/examples/src/main/scripts/run-at-instances.sh
+++ b/sandbox/examples/src/main/scripts/run-at-instances.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
@@ -16,7 +17,6 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-#!/bin/bash
 
 if [ -z "$1" ]; then
    echo "command not found"
@@ -44,4 +44,4 @@ for instance in $INSTANCES ; do
   ssh -f root@$instance "$CMD" | awk '{print "OUTPUT '$instance': " $0}' &
 done
 
-wait
\ No newline at end of file
+wait

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6fab1a49/sandbox/examples/src/main/scripts/stop-instances.sh
----------------------------------------------------------------------
diff --git a/sandbox/examples/src/main/scripts/stop-instances.sh b/sandbox/examples/src/main/scripts/stop-instances.sh
index 9e8489b..a58eb72 100755
--- a/sandbox/examples/src/main/scripts/stop-instances.sh
+++ b/sandbox/examples/src/main/scripts/stop-instances.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
@@ -16,7 +17,6 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-#!/bin/bash
 
 INSTANCES=`cat instances.txt | cut -d " " -f 2`
 
@@ -37,4 +37,4 @@ for instance in $INSTANCES ; do
   sed -i.bk /${instance}/D instances.txt
 done
 
-wait
\ No newline at end of file
+wait

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6fab1a49/usage/all/start-mgmt-web.sh
----------------------------------------------------------------------
diff --git a/usage/all/start-mgmt-web.sh b/usage/all/start-mgmt-web.sh
index 36cda8c..6e3abe7 100755
--- a/usage/all/start-mgmt-web.sh
+++ b/usage/all/start-mgmt-web.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
@@ -16,7 +17,6 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-#!/bin/bash
 #
 # Brooklyn Management
 #

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6fab1a49/usage/archetypes/quickstart/src/brooklyn-sample/src/main/assembly/scripts/start.sh
----------------------------------------------------------------------
diff --git a/usage/archetypes/quickstart/src/brooklyn-sample/src/main/assembly/scripts/start.sh
b/usage/archetypes/quickstart/src/brooklyn-sample/src/main/assembly/scripts/start.sh
index a396db4..5f93b5b 100755
--- a/usage/archetypes/quickstart/src/brooklyn-sample/src/main/assembly/scripts/start.sh
+++ b/usage/archetypes/quickstart/src/brooklyn-sample/src/main/assembly/scripts/start.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
@@ -16,7 +17,6 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-#!/bin/bash
 
 if [ ! -z "$JAVA_HOME" ] ; then 
     JAVA=$JAVA_HOME/bin/java

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6fab1a49/usage/qa/start-monitor.sh
----------------------------------------------------------------------
diff --git a/usage/qa/start-monitor.sh b/usage/qa/start-monitor.sh
index 1ed419d..6461dae 100755
--- a/usage/qa/start-monitor.sh
+++ b/usage/qa/start-monitor.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
@@ -16,7 +17,6 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-#!/bin/bash
 #
 # Brooklyn Management
 #

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6fab1a49/usage/qa/start-webcluster.sh
----------------------------------------------------------------------
diff --git a/usage/qa/start-webcluster.sh b/usage/qa/start-webcluster.sh
index 7ed5afb..497f6b3 100755
--- a/usage/qa/start-webcluster.sh
+++ b/usage/qa/start-webcluster.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
@@ -16,7 +17,6 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-#!/bin/bash
 #
 # Brooklyn Management
 #

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6fab1a49/usage/scripts/change-version.sh
----------------------------------------------------------------------
diff --git a/usage/scripts/change-version.sh b/usage/scripts/change-version.sh
index 46ab939..e2fc12b 100755
--- a/usage/scripts/change-version.sh
+++ b/usage/scripts/change-version.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
@@ -16,7 +17,6 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-#!/bin/bash
 
 # changes the BROOKLYN version everywhere
 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6fab1a49/usage/scripts/grep-in-poms.sh
----------------------------------------------------------------------
diff --git a/usage/scripts/grep-in-poms.sh b/usage/scripts/grep-in-poms.sh
index a4504ac..c3a7f79 100755
--- a/usage/scripts/grep-in-poms.sh
+++ b/usage/scripts/grep-in-poms.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
@@ -16,7 +17,6 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-#!/bin/bash
 
 # usage: run in the root dir of a project, it will grep in poms up to 3 levels deep
 # e.g. where are shaded jars defined?


Mime
View raw message