From f3c2954715c54b6c45c5c261dbcb23edfe7aa8cf Mon Sep 17 00:00:00 2001
From: Pino Toscano <ptoscano@redhat.com>
Date: Wed, 1 Apr 2015 15:44:38 +0200
Subject: [PATCH] Simplify environment.d scripts

Just leave the exports there, removing the shebang as they are sourced
and not executed directly.

This has also the side-effect of making dib-lint ignore them, and thus
enforce on them checks which don't make any good in them.

Change-Id: I2a9506634a9b636ca97bd4a1fab72307c95b5388
Partial-Bug: #1435306
---
 elements/java/environment.d/00-java-rc                | 7 -------
 elements/openjdk/environment.d/00-set-java-distro     | 7 -------
 elements/oracle-java/environment.d/00-set-java-distro | 7 -------
 3 files changed, 21 deletions(-)

diff --git a/elements/java/environment.d/00-java-rc b/elements/java/environment.d/00-java-rc
index dca61654..a6d43ad8 100644
--- a/elements/java/environment.d/00-java-rc
+++ b/elements/java/environment.d/00-java-rc
@@ -1,8 +1 @@
-#!/bin/bash
-
-if [ "${DIB_DEBUG_TRACE:-0}" -gt 0 ]; then
-    set -x
-fi
-set -eu
-
 export JAVA_RC="/etc/profile.d/99-java.sh"
diff --git a/elements/openjdk/environment.d/00-set-java-distro b/elements/openjdk/environment.d/00-set-java-distro
index ddb716f3..168ebf31 100755
--- a/elements/openjdk/environment.d/00-set-java-distro
+++ b/elements/openjdk/environment.d/00-set-java-distro
@@ -1,8 +1 @@
-#!/bin/bash
-
-if [ "${DIB_DEBUG_TRACE:-0}" -gt 0 ]; then
-    set -x
-fi
-set -eu
-
 export DIB_JAVA_DISTRO="openjdk"
diff --git a/elements/oracle-java/environment.d/00-set-java-distro b/elements/oracle-java/environment.d/00-set-java-distro
index a4963736..ff5585f4 100755
--- a/elements/oracle-java/environment.d/00-set-java-distro
+++ b/elements/oracle-java/environment.d/00-set-java-distro
@@ -1,8 +1 @@
-#!/bin/bash
-
-if [ "${DIB_DEBUG_TRACE:-0}" -gt 0 ]; then
-    set -x
-fi
-set -eu
-
 export DIB_JAVA_DISTRO="oracle-java"