File tree 3 files changed +19
-20
lines changed
3 files changed +19
-20
lines changed Original file line number Diff line number Diff line change @@ -65,12 +65,12 @@ print_help() {
65
65
OPTIONS:
66
66
--clean Clear cache and delete builds.
67
67
-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').
69
69
-h | --help Show this help text.
70
70
--headful Open vm in headful mode and do not close image.
71
71
--image Custom image for build (Squeak/Pharo).
72
72
--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.
74
74
--print-env Print all environment variables used by smalltalkCI
75
75
--no-color Disable colored output
76
76
--no-tracking Disable collection of anonymous build metrics (Travis CI & AppVeyor only).
Original file line number Diff line number Diff line change @@ -286,12 +286,12 @@ pharo::prepare_image() {
286
286
mkdir " ${target} "
287
287
fi
288
288
if ! is_file " ${target} " /* .image; then
289
- pushd " ${target} " > /dev/null
289
+ pushd " ${target} " > /dev/null
290
290
fold_start download_image " Downloading ${smalltalk_name} image..."
291
291
download_file " ${pharo_image_url} " " ${pharo_zeroconf} "
292
292
retry 3 " bash ${pharo_zeroconf} "
293
293
fold_end download_image
294
- popd > /dev/null
294
+ popd > /dev/null
295
295
fi
296
296
297
297
print_info " Preparing Pharo image..."
Original file line number Diff line number Diff line change @@ -281,24 +281,23 @@ validate_configuration() {
281
281
}
282
282
283
283
# ###############################################################################
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
285
285
# performed so far.
286
286
# ###############################################################################
287
287
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
302
301
}
303
302
304
303
# ###############################################################################
@@ -358,7 +357,7 @@ parse_options() {
358
357
config_tracking=" false"
359
358
shift
360
359
;;
361
- -o | - -overwrite-cache)
360
+ --overwrite-cache)
362
361
config_overwrite_cache=" true"
363
362
shift
364
363
;;
You can’t perform that action at this time.
0 commit comments