Merge pull request #583 from jmtd/OPENJDK-3655-scriptperms-alt

[OPENJDK-3655] set more sensible permissions on scripts

Author: jmtd

modules/jdk/17/artifacts/opt/jboss/container/openjdk/jdk/jvm-options renamed to modules/jdk/17/artifacts/jvm-options

@@ -2,17 +2,6 @@
 # Configure module
 set -e
 
-SCRIPT_DIR=$(dirname $0)
-ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
-
-chown -R $USER:root $SCRIPT_DIR
-chmod -R ug+rwX $SCRIPT_DIR
-chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/openjdk/jdk/*
-
-pushd ${ARTIFACTS_DIR}
-cp -pr * /
-popd
-
 # Set this JDK as the alternative in use
 _arch="$(uname -i)"
 alternatives --set java java-17-openjdk.${_arch}

modules/jdk/17/configure.sh

@@ -33,3 +33,7 @@ modules:
 
 execute:
 - script: configure.sh
+
+artifacts:
+  - path: artifacts/jvm-options
+    dest: /opt/jboss/container/openjdk/jdk

modules/jdk/17/module.yaml

@@ -2,17 +2,6 @@
 # Configure module
 set -e
 
-SCRIPT_DIR=$(dirname $0)
-ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
-
-chown -R $USER:root $SCRIPT_DIR
-chmod -R ug+rwX $SCRIPT_DIR
-chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/openjdk/jdk/*
-
-pushd ${ARTIFACTS_DIR}
-cp -pr * /
-popd
-
 # Set this JDK as the alternative in use
 _arch="$(uname -i)"
 alternatives --set java java-21-openjdk.${_arch}

modules/jdk/21/artifacts/opt/jboss/container/openjdk/jdk/jvm-options renamed to modules/jdk/21/artifacts/jvm-options

@@ -33,3 +33,7 @@ modules:
 
 execute:
 - script: configure.sh
+
+artifacts:
+  - path: artifacts/jvm-options
+    dest: /opt/jboss/container/openjdk/jdk

modules/jdk/21/configure.sh

@@ -1,20 +1,6 @@
 #!/bin/sh
-# Configure module
 set -e
 
-SCRIPT_DIR=$(dirname $0)
-echo $SCRIPT_DIR
-ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
-echo $ARTIFACTS_DIR
-
-chown -R $USER:root $SCRIPT_DIR
-chmod -R ug+rwX $SCRIPT_DIR
-chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/openjdk/jre/*
-
-pushd ${ARTIFACTS_DIR}
-cp -pr * /
-popd
-
 # Set this JDK as the alternative in use
 _arch="$(uname -i)"
 alternatives --set java java-17-openjdk.${_arch}

modules/jdk/21/module.yaml

@@ -33,3 +33,7 @@ modules:
 
 execute:
 - script: configure.sh
+
+artifacts:
+  - path: artifacts/jvm-options
+    dest: /opt/jboss/container/openjdk/jre