mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-12 07:26:58 +02:00
Fix two very broken tests for null strings in archive_build.sh
Change-Id: I7c5d251ab1ae020c3ae8a10ca017c34a02eff893 BUG=None TEST=./archive_build.sh --test_mod TEST=./archive_build.sh --test_mod --from=../build/images/x86-generic TEST=./archive_build.sh --board=x86-generic --gsutil_archive=/tmp --gsutil=echo TEST=./archive_build.sh --board=x86-generic --gsutil_archive=/tmp --gsutil=echo --gsd_gen_index=echo Review URL: http://codereview.chromium.org/4153001
This commit is contained in:
parent
ada8a1fdcc
commit
e1010d8cb2
@ -67,7 +67,7 @@ fi
|
|||||||
# Die on any errors.
|
# Die on any errors.
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
if [ -z $DEFAULT_USED ]
|
if [ -z "$DEFAULT_USED" ]
|
||||||
then
|
then
|
||||||
if [ $FLAGS_test_mod -eq $FLAGS_TRUE ] || \
|
if [ $FLAGS_test_mod -eq $FLAGS_TRUE ] || \
|
||||||
[ $FLAGS_factory_install_mod -eq $FLAGS_TRUE ] || \
|
[ $FLAGS_factory_install_mod -eq $FLAGS_TRUE ] || \
|
||||||
@ -244,7 +244,7 @@ function gsutil_archive() {
|
|||||||
echo "Using gsutil to archive to ${OUT_PATH}..."
|
echo "Using gsutil to archive to ${OUT_PATH}..."
|
||||||
${FLAGS_gsutil} cp ${IN_PATH} ${FULL_OUT_PATH}
|
${FLAGS_gsutil} cp ${IN_PATH} ${FULL_OUT_PATH}
|
||||||
${FLAGS_gsutil} setacl ${FLAGS_acl} ${FULL_OUT_PATH}
|
${FLAGS_gsutil} setacl ${FLAGS_acl} ${FULL_OUT_PATH}
|
||||||
if [ $FLAGS_gsd_gen_index != "" ]
|
if [ -n "$FLAGS_gsd_gen_index" ]
|
||||||
then
|
then
|
||||||
echo "Updating indexes..."
|
echo "Updating indexes..."
|
||||||
${FLAGS_gsd_gen_index} \
|
${FLAGS_gsd_gen_index} \
|
||||||
|
Loading…
Reference in New Issue
Block a user