From b315713d0a0a328297f2291959e5bca09ca8a940 Mon Sep 17 00:00:00 2001 From: Bent Terp Date: Tue, 24 Nov 2015 04:28:05 +0100 Subject: [PATCH] support for local file:// urls in jargroups Update msm with support for local file:// urls in jargroups. E.g. [root@tux2 tmp]# cat /opt/msm/jars/spigot/target.txt file:///data/spigotbuild/release/spigot-1.8.8.jar [root@tux2 tmp]# --- init/msm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/init/msm b/init/msm index a7029f24..6812be04 100755 --- a/init/msm +++ b/init/msm @@ -1117,10 +1117,18 @@ jargroup_getlatest() { fi fi - if [[ -n "$jar_url" ]]; then - as_user "$SETTINGS_USERNAME" "wget --quiet $wget_opts --no-check-certificate --directory-prefix='$SETTINGS_JAR_STORAGE_PATH/$1/$SETTINGS_JARGROUP_DOWNLOAD_DIR' '$jar_url'" + if [[ -n "$jar_url" ]]; then + if [[ "$jar_url" =~ ^file:// ]]; then + as_user "$SETTINGS_USERNAME" "cp ${jar_url##file://} $SETTINGS_JAR_STORAGE_PATH/$1/$SETTINGS_JARGROUP_DOWNLOAD_DIR" + else + as_user "$SETTINGS_USERNAME" "wget --quiet $wget_opts --no-check-certificate --directory-prefix='$SETTINGS_JAR_STORAGE_PATH/$1/$SETTINGS_JARGROUP_DOWNLOAD_DIR' '$jar_url'" + fi else - as_user "$SETTINGS_USERNAME" "wget --quiet $wget_opts --no-check-certificate --input-file='$SETTINGS_JAR_STORAGE_PATH/$1/$SETTINGS_JARGROUP_TARGET' --directory-prefix='$SETTINGS_JAR_STORAGE_PATH/$1/$SETTINGS_JARGROUP_DOWNLOAD_DIR'" + if grep -q -e "^file://" $SETTINGS_JAR_STORAGE_PATH/$1/$SETTINGS_JARGROUP_TARGET ; then + as_user "$SETTINGS_USERNAME" "cp -v $(cat $SETTINGS_JAR_STORAGE_PATH/$1/$SETTINGS_JARGROUP_TARGET | sed 's/file:\/\///g') $SETTINGS_JAR_STORAGE_PATH/$1/$SETTINGS_JARGROUP_DOWNLOAD_DIR" + else + as_user "$SETTINGS_USERNAME" "wget --quiet $wget_opts --no-check-certificate --input-file='$SETTINGS_JAR_STORAGE_PATH/$1/$SETTINGS_JARGROUP_TARGET' --directory-prefix='$SETTINGS_JAR_STORAGE_PATH/$1/$SETTINGS_JARGROUP_DOWNLOAD_DIR'" + fi fi echo "Done."