Skip to content

Commit d376404

Browse files
committed
- Do not delete the downloaded plugins
1 parent 5803419 commit d376404

File tree

1 file changed

+5
-11
lines changed

1 file changed

+5
-11
lines changed

custom_build.sh

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ readonly USERID=1000
2323
readonly GROUPID=1000
2424
readonly UNAME=tomcat
2525

26-
function help(){
26+
function help() {
2727
if [ "$#" -ne 5 ] ; then
2828
echo "Usage: $0 [docker image tag] [geoserver version] [geoserver main version] [datadir|nodatadir] [pull|no_pull];"
2929
echo "";
@@ -39,11 +39,10 @@ function help(){
3939

4040
function clean_up_directory() {
4141
# we shall never clean datadir
42-
rm -rf ./resources/geoserver-plugins/* ./resources/geoserver/*
42+
echo "rm -rf ./resources/geoserver-plugins/* ./resources/geoserver/*"
4343
}
4444
function create_plugins_folder() {
4545
mkdir -p ./resources/geoserver-plugins
46-
4746
}
4847

4948
function download_from_url_to_a_filepath {
@@ -67,7 +66,6 @@ function download_plugin() {
6766
PLUGIN_FULL_NAME=geoserver-${GEOSERVER_VERSION%.*}-SNAPSHOT-${PLUGIN_NAME}-plugin.zip
6867
PLUGIN_ARTIFACT_URL=${BASE_BUILD_URL}/${GEOSERVER_VERSION}/${TYPE}-latest/${PLUGIN_FULL_NAME}
6968
;;
70-
7169
"main")
7270
PLUGIN_FULL_NAME=geoserver-${GEOSERVER_MASTER_VERSION%.*}-SNAPSHOT-${PLUGIN_NAME}-plugin.zip
7371
PLUGIN_ARTIFACT_URL=${BASE_BUILD_URL}/${GEOSERVER_VERSION}/${TYPE}-latest/${PLUGIN_FULL_NAME}
@@ -84,20 +82,18 @@ function download_plugin() {
8482
PLUGIN_ARTIFACT_URL=${BASE_BUILD_URL}/${GEOSERVER_VERSION%.*}.x/${TYPE}-latest/${PLUGIN_FULL_NAME}
8583
fi
8684
;;
87-
8885
esac
89-
9086
download_from_url_to_a_filepath "${PLUGIN_ARTIFACT_URL}" "${PLUGIN_ARTIFACT_DIRECTORY}/${PLUGIN_FULL_NAME}"
9187
}
9288

93-
function download_fonts() {
89+
function download_fonts() {
9490
if [ ! -e "${FONTS_ARTIFACT_DIRECTORY}" ]; then
9591
mkdir -p "${FONTS_ARTIFACT_DIRECTORY}"
9692
fi
9793
download_from_url_to_a_filepath "${EXTRA_FONTS_URL}" "${FONTS_ARTIFACT_DIRECTORY}/fonts.tar.gz"
9894
}
9995

100-
function download_marlin() {
96+
function download_marlin() {
10197
IFS='.' read -r -a marlin_v_arr <<< "$MARLIN_VERSION"
10298
unset IFS
10399

@@ -142,8 +138,7 @@ function download_geoserver() {
142138

143139

144140
function build_with_data_dir() {
145-
146-
local TAG=${1}
141+
local TAG=${1}
147142
local PULL_ENABLED=${2}
148143
DOCKER_VERSION="$(docker --version | grep "Docker version"| awk '{print $3}' | sed 's/,//')"
149144
case $DOCKER_VERSION in
@@ -183,7 +178,6 @@ function build_with_data_dir() {
183178
}
184179

185180
function build_without_data_dir() {
186-
187181
local TAG=${1}
188182
local PULL_ENABLED=${2}
189183
DOCKER_VERSION="$(docker --version | grep "Docker version"| awk '{print $3}' | sed 's/,//')"

0 commit comments

Comments
 (0)