summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorNoah Slater <nslater@apache.org>2009-07-14 20:21:39 +0000
committerNoah Slater <nslater@apache.org>2009-07-14 20:21:39 +0000
commit350811a34260baed48995c66baf1cb30021d2fbd (patch)
tree339273288be0a4da445d4f69ed94ed6c73318d67 /bin
parent2ad5a154d0494373f55370aac7c4b635089da36a (diff)
wheeeeeeee
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@794057 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'bin')
-rw-r--r--bin/Makefile.am10
-rw-r--r--bin/couchdb.tpl.in7
-rw-r--r--bin/couchjs.tpl.in8
3 files changed, 13 insertions, 12 deletions
diff --git a/bin/Makefile.am b/bin/Makefile.am
index fbe94855..991ceef4 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -1,14 +1,14 @@
## Licensed under the Apache License, Version 2.0 (the "License"); you may not
-## use this file except in compliance with the License. You may obtain a copy
-## of the License at
+## use this file except in compliance with the License. You may obtain a copy of
+## the License at
##
## http://www.apache.org/licenses/LICENSE-2.0
##
## Unless required by applicable law or agreed to in writing, software
## distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-## WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-## License for the specific language governing permissions and limitations
-## under the License.
+## WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+## License for the specific language governing permissions and limitations under
+## the License.
bin_SCRIPTS = couchdb couchjs
noinst_SCRIPTS = couchjs_dev
diff --git a/bin/couchdb.tpl.in b/bin/couchdb.tpl.in
index 56d4e595..033acb97 100644
--- a/bin/couchdb.tpl.in
+++ b/bin/couchdb.tpl.in
@@ -42,17 +42,18 @@ display_version () {
$basename - %package_name% %version%
Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-this file except in compliance with the License. You may obtain a copy of the
+this file except in compliance with the License. You may obtain a copy of the
License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software distributed
under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-CONDITIONS OF ANY KIND, either express or implied. See the License for the
+CONDITIONS OF ANY KIND, either express or implied. See the License for the
specific language governing permissions and limitations under the License.
+
EOF
- }
+}
display_help () {
cat << EOF
diff --git a/bin/couchjs.tpl.in b/bin/couchjs.tpl.in
index 3b21b096..6927a0d4 100644
--- a/bin/couchjs.tpl.in
+++ b/bin/couchjs.tpl.in
@@ -1,14 +1,14 @@
#! /bin/sh -e
# Licensed under the Apache License, Version 2.0 (the "License"); you may not
-# use this file except in compliance with the License. You may obtain a copy of
+# use this file except in compliance with the License. You may obtain a copy of
# the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations under
# the License.
@@ -24,14 +24,14 @@ display_version () {
$basename - %package_name% %version%
Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-this file except in compliance with the License. You may obtain a copy of the
+this file except in compliance with the License. You may obtain a copy of the
License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software distributed
under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-CONDITIONS OF ANY KIND, either express or implied. See the License for the
+CONDITIONS OF ANY KIND, either express or implied. See the License for the
specific language governing permissions and limitations under the License.
EOF
}