Skip to content

Commit 5c28d78

Browse files
committed
chore: apply review suggestions
1 parent 9fe50df commit 5c28d78

File tree

3 files changed

+19
-20
lines changed

3 files changed

+19
-20
lines changed

helpers.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,12 @@ print_help() {
6565
OPTIONS:
6666
--clean Clear cache and delete builds.
6767
-d | --debug Enable debug mode.
68-
--force-cache Force use of the cache for all images (overrides '--overrwrite-cache').
68+
--force-cache Force use of the cache for all images (overrides '--overwrite-cache').
6969
-h | --help Show this help text.
7070
--headful Open vm in headful mode and do not close image.
7171
--image Custom image for build (Squeak/Pharo).
7272
--install Install symlink to this smalltalkCI instance.
73-
-o |--overwrite-cache Download the newest image and cache it.
73+
--overwrite-cache Download the newest image and cache it.
7474
--print-env Print all environment variables used by smalltalkCI
7575
--no-color Disable colored output
7676
--no-tracking Disable collection of anonymous build metrics (Travis CI & AppVeyor only).

pharo/run.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -286,12 +286,12 @@ pharo::prepare_image() {
286286
mkdir "${target}"
287287
fi
288288
if ! is_file "${target}"/*.image; then
289-
pushd "${target}" >/dev/null
289+
pushd "${target}" > /dev/null
290290
fold_start download_image "Downloading ${smalltalk_name} image..."
291291
download_file "${pharo_image_url}" "${pharo_zeroconf}"
292292
retry 3 "bash ${pharo_zeroconf}"
293293
fold_end download_image
294-
popd >/dev/null
294+
popd > /dev/null
295295
fi
296296

297297
print_info "Preparing Pharo image..."

run.sh

+15-16
Original file line numberDiff line numberDiff line change
@@ -281,24 +281,23 @@ validate_configuration() {
281281
}
282282

283283
################################################################################
284-
# Set options that depend on the contex, i.e., the input values and selections
284+
# Set options that depend on the context, i.e., the input values and selections
285285
# performed so far.
286286
################################################################################
287287
set_context_options() {
288-
if [ "${config_force_cache}" = "true" ]; then
289-
print_info "Forcing cache use"
290-
config_overwrite_cache="false"
291-
return
292-
fi
293-
294-
case "${config_smalltalk}" in
295-
*-alpha | *-trunk)
296-
print_info "Forcing image update for in-development version"
297-
config_overwrite_cache="true"
298-
;;
299-
*)
300-
;;
301-
esac
288+
if [[ "${config_force_cache}" = "true" ]]; then
289+
print_info "Forcing cache use"
290+
config_overwrite_cache="false"
291+
else
292+
case "${config_smalltalk}" in
293+
*-alpha | *-trunk)
294+
print_info "Forcing image update for in-development version"
295+
config_overwrite_cache="true"
296+
;;
297+
*)
298+
;;
299+
esac
300+
fi
302301
}
303302

304303
################################################################################
@@ -358,7 +357,7 @@ parse_options() {
358357
config_tracking="false"
359358
shift
360359
;;
361-
-o | --overwrite-cache)
360+
--overwrite-cache)
362361
config_overwrite_cache="true"
363362
shift
364363
;;

0 commit comments

Comments
 (0)