diff options
| author | Mike Frysinger <vapier@chromium.org> | 2014-06-16 01:12:32 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@chromium.org> | 2014-06-17 05:21:07 +0000 |
| commit | 51ca0b82a66f416842d97149010b77297ba62998 (patch) | |
| tree | ddefecd7e1f8494b137b03b87240612bfdbf0f35 | |
| parent | aa888463b860c2852f3fcb17baf8de395fcca294 (diff) | |
| download | vboot-51ca0b82a66f416842d97149010b77297ba62998.tar.gz | |
create_new_keys: drop redundant settings
The common.sh file already defines these variables/funcs, so drop them.
BUG=chromium:381862
TEST=`./create_new_keys.sh` created new keys correctly
BRANCH=none
Change-Id: Ie7f0f683d4971c188d4629b520938b4b65bb0a9f
Reviewed-on: https://chromium-review.googlesource.com/203685
Reviewed-by: Gaurav Shah <gauravsh@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
| -rw-r--r-- | scripts/keygeneration/common.sh | 4 | ||||
| -rwxr-xr-x | scripts/keygeneration/create_new_keys.sh | 10 |
2 files changed, 2 insertions, 12 deletions
diff --git a/scripts/keygeneration/common.sh b/scripts/keygeneration/common.sh index c3c1c25d..aa955dd8 100644 --- a/scripts/keygeneration/common.sh +++ b/scripts/keygeneration/common.sh @@ -117,9 +117,9 @@ function make_keyblock { # File to read current versions from. VERSION_FILE="key.versions" -# ARGS: <VERSION_TYPE> +# ARGS: <VERSION_TYPE> [VERSION_FILE] get_version() { - awk -F= '/^'$1'\>/ { print $NF }' ${2:-${VERSION_FILE}} + awk -F= '/^'$1'\>/ { print $NF }' "${2:-${VERSION_FILE}}" } # Loads the current versions prints them to stdout and sets the global version diff --git a/scripts/keygeneration/create_new_keys.sh b/scripts/keygeneration/create_new_keys.sh index 722d69d8..780f7c97 100755 --- a/scripts/keygeneration/create_new_keys.sh +++ b/scripts/keygeneration/create_new_keys.sh @@ -16,16 +16,6 @@ if [ $# -eq 1 ] && [ $1 = "--devkeyblock" ]; then DEV_KEYBLOCK_FLAG=1 fi -# File to read current versions from. -VERSION_FILE="key.versions" - -# ARGS: <version_type> -get_version() { - local version_type=$1 - version=$(sed -n "s#^${version_type}=\(.*\)#\1#pg" ${VERSION_FILE}) - echo $version -} - if [ ! -e "${VERSION_FILE}" ]; then echo "No version file found. Creating default ${VERSION_FILE}." printf '%s_version=1\n' {firmware,kernel}{_key,} > "${VERSION_FILE}" |