From 1493af3c9f74d4aa97f6a69e2102f9370d99ab1c Mon Sep 17 00:00:00 2001
From: Michael Kelly <mkelly@arista.com>
Date: Tue, 11 Apr 2023 14:40:27 -0700
Subject: [PATCH 1/4] Enable the ability to deploy using unicode server

In some cases users will want to configure the unicode server, this
enables us to do this by providing an additional enviroment variable.
---
 perforce-server/setup-perforce.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/perforce-server/setup-perforce.sh b/perforce-server/setup-perforce.sh
index 60d5d06..eca1d75 100755
--- a/perforce-server/setup-perforce.sh
+++ b/perforce-server/setup-perforce.sh
@@ -14,6 +14,12 @@ fi
 mv /etc/perforce /etc/perforce.orig
 ln -s $DATAVOLUME/etc /etc/perforce
 
+UNICODE=""
+
+if [ "$USE_UNICODE" = "1" ]; then
+    UNICODE="--unicode"
+fi
+
 if [ -z "$P4PASSWD" ]; then
     P4PASSWD="pass12349ers!"
 fi
@@ -27,7 +33,7 @@ for DIR in $P4ROOT $P4SSLDIR; do
 done
 
 if ! p4dctl list 2>/dev/null | grep -q $NAME; then
-    /opt/perforce/sbin/configure-helix-p4d.sh $NAME -n -p $P4PORT -r $P4ROOT -u $P4USER -P "${P4PASSWD}" --case $CASE_INSENSITIVE
+    /opt/perforce/sbin/configure-helix-p4d.sh $NAME -n -p $P4PORT -r $P4ROOT -u $P4USER -P "${P4PASSWD}" --case $CASE_INSENSITIVE $UNICODE
 fi
 
 p4dctl start -t p4d $NAME

From d9926deec1763b794816f3370c7595fe203d2885 Mon Sep 17 00:00:00 2001
From: Michael Kelly <mkelly@arista.com>
Date: Tue, 11 Apr 2023 14:57:39 -0700
Subject: [PATCH 2/4] Minor fixes

* default environment variable
* fix comparison
---
 perforce-server/run.sh            | 1 +
 perforce-server/setup-perforce.sh | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/perforce-server/run.sh b/perforce-server/run.sh
index 457d58c..d330ea1 100755
--- a/perforce-server/run.sh
+++ b/perforce-server/run.sh
@@ -2,6 +2,7 @@
 set -e
 
 export NAME="${NAME:-p4depot}"
+export UNICODE="${UNICODE:0}"
 
 bash /usr/local/bin/setup-perforce.sh
 
diff --git a/perforce-server/setup-perforce.sh b/perforce-server/setup-perforce.sh
index eca1d75..e7c8419 100755
--- a/perforce-server/setup-perforce.sh
+++ b/perforce-server/setup-perforce.sh
@@ -16,7 +16,7 @@ ln -s $DATAVOLUME/etc /etc/perforce
 
 UNICODE=""
 
-if [ "$USE_UNICODE" = "1" ]; then
+if [ "$USE_UNICODE" == "1" ]; then
     UNICODE="--unicode"
 fi
 

From 4cf1cbef3467b8b4d1aefa1f6dad3eb3df053dcc Mon Sep 17 00:00:00 2001
From: Michael Kelly <mkelly@arista.com>
Date: Mon, 1 May 2023 11:39:51 -0700
Subject: [PATCH 3/4] Fix previous commit

---
 perforce-server/run.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/perforce-server/run.sh b/perforce-server/run.sh
index d330ea1..62005f1 100755
--- a/perforce-server/run.sh
+++ b/perforce-server/run.sh
@@ -2,7 +2,7 @@
 set -e
 
 export NAME="${NAME:-p4depot}"
-export UNICODE="${UNICODE:0}"
+export UNICODE="${UNICODE:-0}"
 
 bash /usr/local/bin/setup-perforce.sh
 

From 1c950bd627a1f7cff74f22f9139ee6492b128549 Mon Sep 17 00:00:00 2001
From: Michael Kelly <mkelly@arista.com>
Date: Mon, 1 May 2023 16:31:01 -0700
Subject: [PATCH 4/4] Rename env var in run.sh

---
 perforce-server/run.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/perforce-server/run.sh b/perforce-server/run.sh
index 62005f1..4f74899 100755
--- a/perforce-server/run.sh
+++ b/perforce-server/run.sh
@@ -2,7 +2,7 @@
 set -e
 
 export NAME="${NAME:-p4depot}"
-export UNICODE="${UNICODE:-0}"
+export USE_UNICODE="${USE_UNICODE:-0}"
 
 bash /usr/local/bin/setup-perforce.sh