From 2ed5e21201f2a596e59787c77dfcab42266cb555 Mon Sep 17 00:00:00 2001 From: Sergey Kraynev Date: Fri, 12 Aug 2016 17:17:02 +0300 Subject: [PATCH] Fix linters error by using "ls | grep" Fix error created in patch If190bcddad3b0d310a51dc302303e86c202a41fe . Now it uses "find". Also add check, that provided package is really existed. Previously it was cause of wrong packaging all packages in one, when package is not found. Change-Id: I82508e8841b920cdff38b0f7d673ec74e448701e --- tools/prepare_packages.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/prepare_packages.sh b/tools/prepare_packages.sh index 9155525..d6960b9 100755 --- a/tools/prepare_packages.sh +++ b/tools/prepare_packages.sh @@ -131,6 +131,8 @@ if $build_packages ; then # zip necessary apps pushd "$source_dir" for d in ${packages[*]}; do + # check that package is realy existed + check_dir "$d" # get FQN for creating package package_name="$(grep FullName "$d/package/manifest.yaml" | awk '{print $2}')" filename="$destination_dir/$package_name.zip" @@ -160,8 +162,7 @@ if $upload ; then # to have ability upload one package independently we need to remove it # via client and then upload it without updating its dependencies for d in "${packages[@]}"; do - package_name="$(ls "$destination_dir" | grep "$d")" - filename="$destination_dir/$package_name" + filename="$(find "$destination_dir" -maxdepth 1 -name "*$d*")" pkg_id=$(murano package-list --owned | grep "$d" | awk '{print $2}') murano package-delete "$pkg_id" murano package-import "$filename" --exists-action s