Merge "Refactor acloud.public.errors to acloud.errors."
diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg
index 15ed889..4f8def9 100644
--- a/PREUPLOAD.cfg
+++ b/PREUPLOAD.cfg
@@ -2,4 +2,4 @@
pylint = true
[Hook Scripts]
-acloud_unittests = ${REPO_ROOT}/tools/tradefederation/core/atest/atest.py acloud_test
+acloud_unittests = ${REPO_ROOT}/prebuilts/asuite/atest/linux-x86/atest acloud_test
diff --git a/README.md b/README.md
index b14b250..af2aebc 100755
--- a/README.md
+++ b/README.md
@@ -60,7 +60,7 @@
> $ acloud create
-* Remote instance using a locally built image
+* Remote instance using a locally built image (use `m dist` to build the image)
> $ acloud create --local-image [local-image-path]
@@ -69,7 +69,7 @@
> $ acloud create --local-instance
-* Local instance using a locally built image
+* Local instance using a locally built image (use `m dist` to build the image)
> $ acloud create --local-instance --local-image
diff --git a/create/create_args.py b/create/create_args.py
index 207141e..45b97dc 100644
--- a/create/create_args.py
+++ b/create/create_args.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-#
# Copyright 2018 - The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,6 +16,7 @@
Defines the create arg parser that holds create specific args.
"""
+import argparse
import os
from acloud import errors
@@ -92,15 +91,13 @@
type=str,
dest="serial_log_file",
required=False,
- help="Path to a *tar.gz file where serial logs will be saved "
- "when a device fails on boot.")
+ help=argparse.SUPPRESS)
parser.add_argument(
"--logcat_file",
type=str,
dest="logcat_file",
required=False,
- help="Path to a *tar.gz file where logcat logs will be saved "
- "when a device fails on boot.")
+ help=argparse.SUPPRESS)
def GetCreateArgParser(subparser):
diff --git a/setup/pre_setup_sh/google_setup_warn.sh b/setup/pre_setup_sh/google_setup_warn.sh
index ba827af..7517a59 100755
--- a/setup/pre_setup_sh/google_setup_warn.sh
+++ b/setup/pre_setup_sh/google_setup_warn.sh
@@ -1,15 +1,18 @@
#!/bin/bash
ACLOUD_PREBUILT_PROJECT_DIR=$ANDROID_BUILD_TOP/prebuilts/asuite
-ACLOUD_CONFIG_FOLDER=$ANDROID_BUILD_TOP/vendor/google/tools/acloud
+ACLOUD_VENDOR_FOLDER=$ANDROID_BUILD_TOP/vendor/google/tools/acloud
+ACLOUD_PRESETUP_FOLDER=$ANDROID_BUILD_TOP/tools/acloud/setup/pre_setup_sh
+GOOGLE_CONFIG=$ACLOUD_PRESETUP_FOLDER/google-acloud.config
+GOOGLE_SETUP=$ACLOUD_PRESETUP_FOLDER/google_acloud_setup.sh
GREEN='\033[0;32m'
NC='\033[0m'
RED='\033[0;31m'
# Go to a project we know exists and grab user git config info from there.
if [ ! -d $ACLOUD_PREBUILT_PROJECT_DIR ]; then
- # If this doesn't exist, either it's not a lunch'd env or something weird is going on.
- # Either way, let's stop now.
+ # If this doesn't exist, either it's not a lunch'd env or something weird is
+ # going on. Either way, let's stop now.
exit
fi
@@ -18,12 +21,16 @@
USER=$(git config --get user.email)
popd &> /dev/null
-# Display disclaimer to googlers if it doesn't look like their env will enable
-# streamlined setup.
-if [[ $USER == *@google.com ]] && [ ! -d $ACLOUD_CONFIG_FOLDER ]; then
- echo "It looks like you're a googler running acloud for the first time."
- echo -e "Take a look at ${GREEN}go/acloud-googler-setup${NC} before continuing"
- echo "to enable a streamlined setup experience."
- echo -e "Press [enter] to continue with the ${RED}manual setup flow${NC}."
+if [[ $USER == *@google.com ]]; then
+ echo "It looks like you're a googler running acloud setup."
+ echo -e "Take a look at ${GREEN}go/acloud-googler-setup${NC} first"
+ echo "before continuing to enable a streamlined setup experience."
+ echo -n "Press [enter] to continue"
+ # Display disclaimer to googlers if it doesn't look like their env will
+ # enable streamlined setup.
+ if [ ! -d $ACLOUD_VENDOR_FOLDER ] && [ ! -f $GOOGLE_CONFIG ] &&
+ [ ! -f $GOOGLE_SETUP ]; then
+ echo -e " with the ${RED}manual setup flow${NC}."
+ fi
read
fi