From b313c196a16a2bd73c712ade5f36c7835fabf9eb Mon Sep 17 00:00:00 2001
From: Joakim Roubert <joakim.roubert@axis.com>
Date: Fri, 6 Mar 2020 13:34:56 +0100
Subject: [PATCH] package-cli: Remove redundant rm -rf build/data

Moving symlinks to containerd to a for loop makes maintenance easier;
also using the -f flag for ln rather than having a separate rm step.
It also reveals a duplicate, redundant, rm -rf build/data and one
duplicate, redundant, rm -rf bin/kubectl, that can be both be purged.

Signed-off-by: Joakim Roubert <joakim.roubert@axis.com>
---
 scripts/package-cli | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/scripts/package-cli b/scripts/package-cli
index 4ca3a6f27fd..e848b03dd72 100755
--- a/scripts/package-cli
+++ b/scripts/package-cli
@@ -7,11 +7,10 @@ cd $(dirname $0)/..
 
 GO=${GO-go}
 
-rm -rf bin/crictl bin/kubectl bin/k3s-agent bin/k3s-server bin/kubectl bin/k3s build/data
-ln -s containerd bin/k3s-agent
-ln -s containerd bin/k3s-server
-ln -s containerd bin/kubectl
-ln -s containerd bin/crictl
+for i in crictl kubectl k3s-agent k3s-server k3s; do
+    ln -fs containerd bin/$i
+done
+
 for i in bridge flannel host-local loopback portmap; do
     if [ -e ./bin/$i ]; then
         rm -f ./bin/$i
@@ -58,8 +57,8 @@ LDFLAGS="
     -w -s
 "
 STATIC="-extldflags '-static'"
-if [ "$DQLITE" = "true" ]; then
-    DQLITE_TAGS="dqlite"
+if [ "$DQLITE" = 'true' ]; then
+    DQLITE_TAGS='dqlite'
 fi
 CGO_ENABLED=0 "${GO}" build -tags "$DQLITE_TAGS" -ldflags "$LDFLAGS $STATIC" -o ${CMD_NAME} ./cmd/k3s/main.go