mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-22 14:11:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix/standardize exiting if common.sh can't be found

Browse Source 
The problem here is that most were doing their exiting w/in a subshell;
exit within a subshell kills the subshell, not the parent.  Not all scripts
were using set -e (which would pick up the failing subshell); as such
just rewriting them to remove the potential via eliminateing the subshelling.

Beyond that, removed a couple of custom (working, although non-standard)
approaches, and removed a duplicate common.sh sourc'ing w/in mk_memento_images.sh

TEST=force 'find_common_sh' to fail, note the scripts fails to exit
BUG=none

Change-Id: Ia1108a091a6399ad6aedd3cade4a107f4411686c
Reviewed-on: http://gerrit.chromium.org/gerrit/3905
Reviewed-by: Brian Harring <ferringb@chromium.org>
Tested-by: Brian Harring <ferringb@chromium.org>
This commit is contained in:
Brian Harring 2011-07-11 16:36:21 -07:00
parent 242212311d
commit d5d5dbffa1
35 changed files with 35 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
archive_build.sh
View File

@ -24,7 +24,7 @@ find_common_sh() {
} }
find_common_sh find_common_sh
. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1) . "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
# --- END COMMON.SH BOILERPLATE --- # --- END COMMON.SH BOILERPLATE ---
# Script must be run outside the chroot # Script must be run outside the chroot

2
archive_hwqual
View File

@ -24,7 +24,7 @@ find_common_sh() {
} }
find_common_sh find_common_sh
. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1) . "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
# --- END COMMON.SH BOILERPLATE --- # --- END COMMON.SH BOILERPLATE ---
# Flags # Flags

2
build_gpt.sh
View File

@ -22,7 +22,7 @@ find_common_sh() {
} }
find_common_sh find_common_sh
. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1) . "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
# --- END COMMON.SH BOILERPLATE --- # --- END COMMON.SH BOILERPLATE ---
# Load functions and constants for chromeos-install # Load functions and constants for chromeos-install

2
build_kernel_image.sh
View File

@ -24,7 +24,7 @@ find_common_sh() {
} }
find_common_sh find_common_sh
. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1) . "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
# --- END COMMON.SH BOILERPLATE --- # --- END COMMON.SH BOILERPLATE ---
get_default_board get_default_board

2
check_control_files.sh
View File

@ -27,7 +27,7 @@ find_common_sh() {
} }
find_common_sh find_common_sh
. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1) . "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
# --- END COMMON.SH BOILERPLATE --- # --- END COMMON.SH BOILERPLATE ---
AUTOTEST_ROOT=${SRC_ROOT}/third_party/autotest/files AUTOTEST_ROOT=${SRC_ROOT}/third_party/autotest/files

2
clean_loopback_devices
View File

@ -26,7 +26,7 @@ find_common_sh() {
} }
find_common_sh find_common_sh
. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1) . "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1;}
# --- END COMMON.SH BOILERPLATE --- # --- END COMMON.SH BOILERPLATE ---
# Script must be run inside the chroot. # Script must be run inside the chroot.

2
create_esp.sh
View File

@ -24,7 +24,7 @@ find_common_sh() {
} }
find_common_sh find_common_sh
. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1) . "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
# --- END COMMON.SH BOILERPLATE --- # --- END COMMON.SH BOILERPLATE ---
get_default_board get_default_board

2
create_legacy_bootloader_templates.sh
View File

@ -24,7 +24,7 @@ find_common_sh() {
} }
find_common_sh find_common_sh
. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1) . "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
# --- END COMMON.SH BOILERPLATE --- # --- END COMMON.SH BOILERPLATE ---
get_default_board get_default_board

2
cros_download_latest_image
View File

@ -25,7 +25,7 @@ find_common_sh() {
} }
find_common_sh find_common_sh
. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1) . "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
# --- END COMMON.SH BOILERPLATE --- # --- END COMMON.SH BOILERPLATE ---
get_default_board get_default_board

2
cros_generate_breakpad_symbols
View File

@ -27,7 +27,7 @@ find_common_sh() {
} }
find_common_sh find_common_sh
. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1) . "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
# --- END COMMON.SH BOILERPLATE --- # --- END COMMON.SH BOILERPLATE ---
# Script must be run inside the chroot # Script must be run inside the chroot

2
cros_show_stacks
View File

@ -24,7 +24,7 @@ find_common_sh() {
} }
find_common_sh find_common_sh
. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1) . "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
# --- END COMMON.SH BOILERPLATE --- # --- END COMMON.SH BOILERPLATE ---
. "${SCRIPT_ROOT}/remote_access.sh" || die "Unable to load remote_access.sh" . "${SCRIPT_ROOT}/remote_access.sh" || die "Unable to load remote_access.sh"

2
emit_gpt_scripts.sh
View File

@ -23,7 +23,7 @@ find_common_sh() {
} }
find_common_sh find_common_sh
. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1) . "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
# --- END COMMON.SH BOILERPLATE --- # --- END COMMON.SH BOILERPLATE ---
# Need to be inside the chroot to load chromeos-common.sh # Need to be inside the chroot to load chromeos-common.sh

2
enter_chroot.sh
View File

@ -24,7 +24,7 @@ find_common_sh() {
} }
find_common_sh find_common_sh
. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1) . "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
# --- END COMMON.SH BOILERPLATE --- # --- END COMMON.SH BOILERPLATE ---
# Script must be run outside the chroot and as a regular user. # Script must be run outside the chroot and as a regular user.

2
get_latest_image.sh
View File

@ -24,7 +24,7 @@ find_common_sh() {
} }
find_common_sh find_common_sh
. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1) . "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
# --- END COMMON.SH BOILERPLATE --- # --- END COMMON.SH BOILERPLATE ---
get_default_board get_default_board

2
get_package_list
View File

@ -25,7 +25,7 @@ find_common_sh() {
} }
find_common_sh find_common_sh
. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1) . "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
# --- END COMMON.SH BOILERPLATE --- # --- END COMMON.SH BOILERPLATE ---
# Script must be run inside the chroot. # Script must be run inside the chroot.

2
image_to_usb.sh
View File

@ -24,7 +24,7 @@ find_common_sh() {
} }
find_common_sh find_common_sh
. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1) . "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
# --- END COMMON.SH BOILERPLATE --- # --- END COMMON.SH BOILERPLATE ---
# Load functions and constants for chromeos-install # Load functions and constants for chromeos-install

2
image_to_vm.sh
View File

@ -25,7 +25,7 @@ find_common_sh() {
} }
find_common_sh find_common_sh
. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1) . "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
# --- END COMMON.SH BOILERPLATE --- # --- END COMMON.SH BOILERPLATE ---
# Need to be inside the chroot to load chromeos-common.sh # Need to be inside the chroot to load chromeos-common.sh

2
make_developer_script_runner.sh
View File

@ -27,7 +27,7 @@ find_common_sh() {
} }
find_common_sh find_common_sh
. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1) . "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
# --- END COMMON.SH BOILERPLATE --- # --- END COMMON.SH BOILERPLATE ---
# Need to be inside the chroot to load chromeos-common.sh # Need to be inside the chroot to load chromeos-common.sh

2
make_factory_package.sh
View File

@ -29,7 +29,7 @@ find_common_sh() {
} }
find_common_sh find_common_sh
. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1) . "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
# --- END COMMON.SH BOILERPLATE --- # --- END COMMON.SH BOILERPLATE ---
# Load functions and constants for chromeos-install # Load functions and constants for chromeos-install

2
make_netboot.sh
View File

@ -33,7 +33,7 @@ find_common_sh() {
} }
find_common_sh find_common_sh
. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1) . "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
# --- END COMMON.SH BOILERPLATE --- # --- END COMMON.SH BOILERPLATE ---
# Script must be run inside the chroot. # Script must be run inside the chroot.
restart_in_chroot_if_needed "$@" restart_in_chroot_if_needed "$@"

4
mk_memento_images.sh
View File

@ -28,11 +28,9 @@ find_common_sh() {
} }
find_common_sh find_common_sh
. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1) . "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
# --- END COMMON.SH BOILERPLATE --- # --- END COMMON.SH BOILERPLATE ---
. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1)
# Load functions designed for image processing # Load functions designed for image processing
if ! . "${SCRIPT_ROOT}/lib/cros_image_common.sh"; then if ! . "${SCRIPT_ROOT}/lib/cros_image_common.sh"; then
echo "ERROR: Cannot load required library: lib/cros_image_common.sh; Abort." echo "ERROR: Cannot load required library: lib/cros_image_common.sh; Abort."

2
mod_image_for_recovery.sh
View File

@ -27,7 +27,7 @@ find_common_sh() {
} }
find_common_sh find_common_sh
. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1) . "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
# --- END COMMON.SH BOILERPLATE --- # --- END COMMON.SH BOILERPLATE ---
# Need to be inside the chroot to load chromeos-common.sh # Need to be inside the chroot to load chromeos-common.sh

2
mod_image_for_test.sh
View File

@ -37,7 +37,7 @@ find_common_sh() {
} }
find_common_sh find_common_sh
. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1) . "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
# --- END COMMON.SH BOILERPLATE --- # --- END COMMON.SH BOILERPLATE ---
# Need to be inside the chroot to load chromeos-common.sh # Need to be inside the chroot to load chromeos-common.sh

2
mount_gpt_image.sh
View File

@ -25,7 +25,7 @@ find_common_sh() {
} }
find_common_sh find_common_sh
. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1) . "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
# --- END COMMON.SH BOILERPLATE --- # --- END COMMON.SH BOILERPLATE ---
if [ $INSIDE_CHROOT -ne 1 ]; then if [ $INSIDE_CHROOT -ne 1 ]; then

2
resize_stateful_partition.sh
View File

@ -24,7 +24,7 @@ find_common_sh() {
} }
find_common_sh find_common_sh
. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1) . "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
# --- END COMMON.SH BOILERPLATE --- # --- END COMMON.SH BOILERPLATE ---
# Need to be inside the chroot to load chromeos-common.sh # Need to be inside the chroot to load chromeos-common.sh

2
run_chroot_version_hooks
View File

@ -7,7 +7,7 @@
# Load common CrOS utilities. Inside the chroot this file is installed in # Load common CrOS utilities. Inside the chroot this file is installed in
# /usr/lib/crosutils. Outside the chroot we find it relative to the script's # /usr/lib/crosutils. Outside the chroot we find it relative to the script's
# location. # location.
. "$(dirname "$0")/common.sh" || ! echo "Unable to load common.sh" || exit 1 . "$(dirname "$0")/common.sh" || { echo "Unable to load common.sh"; exit 1; }
# Script must run inside the chroot. # Script must run inside the chroot.
assert_inside_chroot assert_inside_chroot

2
ssh_test.sh
View File

@ -26,7 +26,7 @@ find_common_sh() {
} }
find_common_sh find_common_sh
. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1) . "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
# --- END COMMON.SH BOILERPLATE --- # --- END COMMON.SH BOILERPLATE ---
. "${SCRIPT_ROOT}/remote_access.sh" || die "Unable to load remote_access.sh" . "${SCRIPT_ROOT}/remote_access.sh" || die "Unable to load remote_access.sh"

2
start_devserver
View File

@ -23,7 +23,7 @@ find_common_sh() {
} }
find_common_sh find_common_sh
. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1) . "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
# --- END COMMON.SH BOILERPLATE --- # --- END COMMON.SH BOILERPLATE ---
# Script must be run inside the chroot if not in 'always serve' mode. # Script must be run inside the chroot if not in 'always serve' mode.

2
test_build_root
View File

@ -22,7 +22,7 @@ find_common_sh() {
} }
find_common_sh find_common_sh
. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1) . "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
# --- END COMMON.SH BOILERPLATE --- # --- END COMMON.SH BOILERPLATE ---
# Flags # Flags

2
test_image
View File

@ -22,7 +22,7 @@ find_common_sh() {
} }
find_common_sh find_common_sh
. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1) . "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
# --- END COMMON.SH BOILERPLATE --- # --- END COMMON.SH BOILERPLATE ---
# Flags # Flags

2
update_bootloaders.sh
View File

@ -25,7 +25,7 @@ find_common_sh() {
} }
find_common_sh find_common_sh
. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1) . "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
# --- END COMMON.SH BOILERPLATE --- # --- END COMMON.SH BOILERPLATE ---
# Need to be inside the chroot to load chromeos-common.sh # Need to be inside the chroot to load chromeos-common.sh

2
update_chroot
View File

@ -9,7 +9,7 @@
# Load common CrOS utilities. Inside the chroot this file is installed in # Load common CrOS utilities. Inside the chroot this file is installed in
# /usr/lib/crosutils. Outside the chroot we find it relative to the script's # /usr/lib/crosutils. Outside the chroot we find it relative to the script's
# location. # location.
. "$(dirname $0)/common.sh" || ! echo "Unable to load common.sh" || exit 1 . "$(dirname $0)/common.sh" || { echo "Unable to load common.sh"; exit 1; }
# Script must run inside the chroot # Script must run inside the chroot
assert_inside_chroot "$@" assert_inside_chroot "$@"

2
update_kernel.sh
View File

@ -24,7 +24,7 @@ find_common_sh() {
} }
find_common_sh find_common_sh
. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1) . "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
# --- END COMMON.SH BOILERPLATE --- # --- END COMMON.SH BOILERPLATE ---
. "${SCRIPT_ROOT}/remote_access.sh" . "${SCRIPT_ROOT}/remote_access.sh"

2
upload_symbols
View File

@ -26,7 +26,7 @@ find_common_sh() {
} }
find_common_sh find_common_sh
. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1) . "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
# --- END COMMON.SH BOILERPLATE --- # --- END COMMON.SH BOILERPLATE ---
# Script must be run inside the chroot # Script must be run inside the chroot

2
verify_rootfs_chksum.sh
View File

@ -24,7 +24,7 @@ find_common_sh() {
} }
find_common_sh find_common_sh
. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1) . "${SCRIPT_ROOT}/common.sh" || { echo "Unable to load common.sh"; exit 1; }
# --- END COMMON.SH BOILERPLATE --- # --- END COMMON.SH BOILERPLATE ---
# Load functions and constants for chromeos-install # Load functions and constants for chromeos-install