From 8e91dd4024daa141ffacaa5bbf99e29c5a66abd2 Mon Sep 17 00:00:00 2001
From: Marc Nijdam <marc_nijdam@mac.com>
Date: Tue, 6 Jul 2021 11:22:00 -0600
Subject: [PATCH] work around cargo-make env issue

---
 Makefile.toml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/Makefile.toml b/Makefile.toml
index 25fc090f..0c3752c2 100644
--- a/Makefile.toml
+++ b/Makefile.toml
@@ -23,24 +23,27 @@ PKG = "deb"
 [env.klkgw]
 CROSS_TARGET = "armv7-unknown-linux-musleabihf"
 PKG = "ipk"
+IPK_USE_AR = false
 
 [env.ramips_24kec]
 CROSS_TARGET = "mipsel-unknown-linux-musl"
 PKG = "ipk"
+IPK_USE_AR = false
 
 [env.dragino]
 CROSS_TARGET = "mips-unknown-linux-musl"
 PKG = "ipk"
+IPK_USE_AR = false
 
 [env.mtcdt]
 CROSS_TARGET = "armv5te-unknown-linux-musleabi"
 PKG = "ipk"
-IPK_USE_AR = "true"
+IPK_USE_AR = true
 
 [env.resiot]
 CROSS_TARGET = "armv7-unknown-linux-gnueabihf"
 PKG = "ipk"
-IPK_USE_AR = "true"
+IPK_USE_AR = true
 
 [tasks.cross]
 description = "Runs the cross rust compiler."
@@ -69,7 +72,7 @@ run_task = [
 description = "Builds an ipk for openwrt/opk based targets"
 category = "Package"
 dependencies = ["cross"]
-condition = { env_set = ["CROSS_TARGET", "TAR", "AR", "PKG_NAME"] }
+condition = { env_set = ["CROSS_TARGET", "TAR", "AR", "PKG_NAME", "IPK_USE_AR"] }
 env = { "PKG_BUILD_DIR" = "target/pkg/${CARGO_MAKE_PROFILE}", "PKG_SRC_DIR" = "package/${CARGO_MAKE_PROFILE}" }
 script = '''
 	# make base folder
@@ -106,7 +109,7 @@ script = '''
 	cd ${CARGO_MAKE_WORKING_DIRECTORY}
 
 	cd ${PKG_BUILD_DIR}
-	if [ "true" = "${IPK_USE_AR}" ]; then
+	if ${IPK_USE_AR} ; then
 		rm -f ../${PKG_NAME}
 		${AR} r ../${PKG_NAME} ./debian-binary ./data.tar.gz ./control.tar.gz
 	else