diff --git a/bin/create-release-artifact b/bin/create-release-artifact index e017b3be8d..86d4d5df39 100755 --- a/bin/create-release-artifact +++ b/bin/create-release-artifact @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with diff --git a/bin/mkdistro.sh b/bin/mkdistro.sh index e0cff36151..550780ccad 100755 --- a/bin/mkdistro.sh +++ b/bin/mkdistro.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file diff --git a/bin/test-patch b/bin/test-patch index 4614978905..ce74d70fb9 100755 --- a/bin/test-patch +++ b/bin/test-patch @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/bin/test-patch-00-clean b/bin/test-patch-00-clean index d2009868ce..ee0ca964b9 100755 --- a/bin/test-patch-00-clean +++ b/bin/test-patch-00-clean @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/bin/test-patch-05-patch-raw-analysis b/bin/test-patch-05-patch-raw-analysis index 1f231f20b8..cec71384f7 100755 --- a/bin/test-patch-05-patch-raw-analysis +++ b/bin/test-patch-05-patch-raw-analysis @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/bin/test-patch-08-rat b/bin/test-patch-08-rat index 7eea74a228..2df19c003a 100755 --- a/bin/test-patch-08-rat +++ b/bin/test-patch-08-rat @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/bin/test-patch-09-javadoc b/bin/test-patch-09-javadoc index 2a16b0c0f7..a272b7c23d 100755 --- a/bin/test-patch-09-javadoc +++ b/bin/test-patch-09-javadoc @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/bin/test-patch-10-compile b/bin/test-patch-10-compile index 949a46c69e..59c94e0e3d 100755 --- a/bin/test-patch-10-compile +++ b/bin/test-patch-10-compile @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/bin/test-patch-11-findbugs-diff b/bin/test-patch-11-findbugs-diff index 8001bb85c4..c884daaa3b 100755 --- a/bin/test-patch-11-findbugs-diff +++ b/bin/test-patch-11-findbugs-diff @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/bin/test-patch-15-backwards-compatibility b/bin/test-patch-15-backwards-compatibility index bf0f21fc92..0023261b0b 100755 --- a/bin/test-patch-15-backwards-compatibility +++ b/bin/test-patch-15-backwards-compatibility @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/bin/test-patch-20-tests b/bin/test-patch-20-tests index e8cb96e0e9..65f9f4a83a 100755 --- a/bin/test-patch-20-tests +++ b/bin/test-patch-20-tests @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/bin/test-patch-30-distro b/bin/test-patch-30-distro index fbfe7b90c6..f72d516d7b 100755 --- a/bin/test-patch-30-distro +++ b/bin/test-patch-30-distro @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/bin/test-patch-XX-template b/bin/test-patch-XX-template index 71f79968ee..6a11297654 100755 --- a/bin/test-patch-XX-template +++ b/bin/test-patch-XX-template @@ -1,4 +1,4 @@ -!/bin/bash +#!/usr/bin/env bash # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/bin/test-patch-find-new-patch-available-jiras b/bin/test-patch-find-new-patch-available-jiras index 0d493d5e29..c5a7c8dda9 100755 --- a/bin/test-patch-find-new-patch-available-jiras +++ b/bin/test-patch-find-new-patch-available-jiras @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/client/src/main/bin/oozie b/client/src/main/bin/oozie index 88b06e8e96..b8db5ee81f 100644 --- a/client/src/main/bin/oozie +++ b/client/src/main/bin/oozie @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file diff --git a/core/src/main/conf/oozie-env.sh b/core/src/main/conf/oozie-env.sh index 3cdfbe22b9..f03baee7df 100644 --- a/core/src/main/conf/oozie-env.sh +++ b/core/src/main/conf/oozie-env.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file diff --git a/core/src/main/resources/ssh-wrapper.sh b/core/src/main/resources/ssh-wrapper.sh index 9dff4e7f02..e2e6f7f9b1 100644 --- a/core/src/main/resources/ssh-wrapper.sh +++ b/core/src/main/resources/ssh-wrapper.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file diff --git a/distro/src/main/bin/addtowar.sh b/distro/src/main/bin/addtowar.sh index 688ba6bbfe..9b0512494a 100644 --- a/distro/src/main/bin/addtowar.sh +++ b/distro/src/main/bin/addtowar.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file diff --git a/distro/src/main/bin/oozie-jetty-server.sh b/distro/src/main/bin/oozie-jetty-server.sh index 228a5c1f4e..711b5219a7 100644 --- a/distro/src/main/bin/oozie-jetty-server.sh +++ b/distro/src/main/bin/oozie-jetty-server.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file diff --git a/distro/src/main/bin/oozie-run.sh b/distro/src/main/bin/oozie-run.sh index 8d4017027f..7336cb9547 100755 --- a/distro/src/main/bin/oozie-run.sh +++ b/distro/src/main/bin/oozie-run.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file diff --git a/distro/src/main/bin/oozie-setup.sh b/distro/src/main/bin/oozie-setup.sh index 0b3974e883..f21b9966bc 100644 --- a/distro/src/main/bin/oozie-setup.sh +++ b/distro/src/main/bin/oozie-setup.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file diff --git a/distro/src/main/bin/oozie-start.sh b/distro/src/main/bin/oozie-start.sh index c1a38d4ca3..dd9e994ca1 100644 --- a/distro/src/main/bin/oozie-start.sh +++ b/distro/src/main/bin/oozie-start.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file diff --git a/distro/src/main/bin/oozie-stop.sh b/distro/src/main/bin/oozie-stop.sh index 92d77f5a23..f0a92fbbb0 100644 --- a/distro/src/main/bin/oozie-stop.sh +++ b/distro/src/main/bin/oozie-stop.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file diff --git a/distro/src/main/bin/oozie-sys.sh b/distro/src/main/bin/oozie-sys.sh index 55f101cf82..f53590460d 100755 --- a/distro/src/main/bin/oozie-sys.sh +++ b/distro/src/main/bin/oozie-sys.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file diff --git a/distro/src/main/bin/oozied.sh b/distro/src/main/bin/oozied.sh index 0b1b9877ad..7162fd0dc3 100644 --- a/distro/src/main/bin/oozied.sh +++ b/distro/src/main/bin/oozied.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file diff --git a/release-log.txt b/release-log.txt index cbe849aa03..927eb627da 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 5.1.0 release (trunk - unreleased) +OOZIE-2352 Unportable shebang in shell scripts (dbist13 via andras.piros) OOZIE-2211 Remove OozieCLI#validateCommandV41 (dbist13 via andras.piros) OOZIE-3178 ./bin/mkdistro.sh -Papache-release fails due to javadoc errors (dbist13 via gezapeti) OOZIE-2967 TestStatusTransitService.testBundleStatusCoordSubmitFails fails intermittently in Apache Oozie Core 5.0.0-SNAPSHOT (pbacsko) diff --git a/source-headers.txt b/source-headers.txt index 5a5c3f3bc3..0999ca4a2b 100644 --- a/source-headers.txt +++ b/source-headers.txt @@ -24,7 +24,7 @@ File types: XML XSD HTML ---------------------------------- File types: SCRIPT PROPERTIES TEXT -#!/bin/bash +#!/usr/bin/env bash # # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file diff --git a/tools/src/main/bin/oozie-diag-bundle-collector.sh b/tools/src/main/bin/oozie-diag-bundle-collector.sh index 68929e1744..55e9d189f4 100755 --- a/tools/src/main/bin/oozie-diag-bundle-collector.sh +++ b/tools/src/main/bin/oozie-diag-bundle-collector.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file diff --git a/tools/src/main/bin/ooziedb.sh b/tools/src/main/bin/ooziedb.sh index b57cff1ffd..b9e38af9de 100644 --- a/tools/src/main/bin/ooziedb.sh +++ b/tools/src/main/bin/ooziedb.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file