From 7038eec15db5db3539d13982a9a19724d6b614b2 Mon Sep 17 00:00:00 2001
From: Yves Fischer <yvesf-git@xapek.org>
Date: Thu, 28 Jan 2016 00:14:30 +0100
Subject: move env files

---
 .../src/main/resources/bin/activate.inc.sh         | 68 ----------------------
 .../src/main/resources/lib/activate.inc.sh         | 68 ++++++++++++++++++++++
 .../src/main/resources/lib/environments.inc.sh     |  6 ++
 3 files changed, 74 insertions(+), 68 deletions(-)
 delete mode 100644 packages/cern-scripts/src/main/resources/bin/activate.inc.sh
 create mode 100644 packages/cern-scripts/src/main/resources/lib/activate.inc.sh
 create mode 100644 packages/cern-scripts/src/main/resources/lib/environments.inc.sh

(limited to 'packages/cern-scripts')

diff --git a/packages/cern-scripts/src/main/resources/bin/activate.inc.sh b/packages/cern-scripts/src/main/resources/bin/activate.inc.sh
deleted file mode 100644
index 79bed6b..0000000
--- a/packages/cern-scripts/src/main/resources/bin/activate.inc.sh
+++ /dev/null
@@ -1,68 +0,0 @@
-
-# non-interactive activate
- __activate_env() {
-    for func in $(typeset -F | cut -f 3 -d ' ' | grep -E '^__env_'); do
-        if [[ "$func" == "__env_$1" ]]; then
-            $func
-            echo "Activated $1"
-            return 0
-        fi
-    done
-    echo "Error: Environment not found $1" >&2
-    return 1
-}
-
-# print all defined envs
-list_envs() {
-    for env in $(typeset -F | sed -n -e 's/^declare -f __env_//p'); do
-        active=false
-        for env_active in $ENV_ACTIVE; do
-            if [ "$env_active" == "$env" ]; then
-                active=true
-            fi
-        done
-        if $active; then
-            echo -n "${env}* "
-        else
-            echo -n "$env "
-        fi
-    done
-    echo ""
-}
-
-plain_list_envs() {
-    typeset -F | sed -n -e 's/^declare -f __env_//p'
-}
-
-# Interactive activate
-activate() {
-    err=false
-    for env in $*; do
-        if ! typeset -F | grep -q -E "^declare -f __env_${env}$"; then
-            echo "Environment not defined: $env"
-            err=true
-        fi
-    done
-    if $err; then
-        return 1
-    fi
-
-    for env in $*; do
-        if typeset -F | grep -q -E "^declare -f __env_${env}$"; then
-            export ENV_ACTIVE="$ENV_ACTIVE${ENV_ACTIVE:+ }$env"
-            __env_${env}
-        fi
-    done
-    echo "Active: $ENV_ACTIVE"
-}
-
-# initialization
-for env_request in $ENV_ACTIVE; do
-    __activate_env $env_request
-done
-
-# bash-completion for `activate'
-_activate() {
-    _init_completion -s || return
-    COMPREPLY=( $(compgen -W "$(list_envs)" -- $cur) )
-} && complete -F _activate activate
diff --git a/packages/cern-scripts/src/main/resources/lib/activate.inc.sh b/packages/cern-scripts/src/main/resources/lib/activate.inc.sh
new file mode 100644
index 0000000..79bed6b
--- /dev/null
+++ b/packages/cern-scripts/src/main/resources/lib/activate.inc.sh
@@ -0,0 +1,68 @@
+
+# non-interactive activate
+ __activate_env() {
+    for func in $(typeset -F | cut -f 3 -d ' ' | grep -E '^__env_'); do
+        if [[ "$func" == "__env_$1" ]]; then
+            $func
+            echo "Activated $1"
+            return 0
+        fi
+    done
+    echo "Error: Environment not found $1" >&2
+    return 1
+}
+
+# print all defined envs
+list_envs() {
+    for env in $(typeset -F | sed -n -e 's/^declare -f __env_//p'); do
+        active=false
+        for env_active in $ENV_ACTIVE; do
+            if [ "$env_active" == "$env" ]; then
+                active=true
+            fi
+        done
+        if $active; then
+            echo -n "${env}* "
+        else
+            echo -n "$env "
+        fi
+    done
+    echo ""
+}
+
+plain_list_envs() {
+    typeset -F | sed -n -e 's/^declare -f __env_//p'
+}
+
+# Interactive activate
+activate() {
+    err=false
+    for env in $*; do
+        if ! typeset -F | grep -q -E "^declare -f __env_${env}$"; then
+            echo "Environment not defined: $env"
+            err=true
+        fi
+    done
+    if $err; then
+        return 1
+    fi
+
+    for env in $*; do
+        if typeset -F | grep -q -E "^declare -f __env_${env}$"; then
+            export ENV_ACTIVE="$ENV_ACTIVE${ENV_ACTIVE:+ }$env"
+            __env_${env}
+        fi
+    done
+    echo "Active: $ENV_ACTIVE"
+}
+
+# initialization
+for env_request in $ENV_ACTIVE; do
+    __activate_env $env_request
+done
+
+# bash-completion for `activate'
+_activate() {
+    _init_completion -s || return
+    COMPREPLY=( $(compgen -W "$(list_envs)" -- $cur) )
+} && complete -F _activate activate
diff --git a/packages/cern-scripts/src/main/resources/lib/environments.inc.sh b/packages/cern-scripts/src/main/resources/lib/environments.inc.sh
new file mode 100644
index 0000000..517f500
--- /dev/null
+++ b/packages/cern-scripts/src/main/resources/lib/environments.inc.sh
@@ -0,0 +1,6 @@
+__env_java8() {
+  export JAVA_HOME=/usr/lib/jvm/java-8.66-oraclejdk/
+  export PATH=$JAVA_HOME/bin:$PATH
+
+
+}
\ No newline at end of file
-- 
cgit v1.2.1