From 6653d5d612ea4cdaf74484487f4d6c5ea41c023e Mon Sep 17 00:00:00 2001
From: 2trvl <38960745+2trvl@users.noreply.github.com>
Date: Tue, 31 Jan 2023 23:55:00 +0300
Subject: [PATCH 1/4] add cloudflare-warp

---
 .../files/cloudflare-warp/conf                |  5 ++++
 .../files/cloudflare-warp/log/run             | 12 ++++++++
 .../cloudflare-warp/files/cloudflare-warp/run |  3 ++
 srcpkgs/cloudflare-warp/template              | 29 +++++++++++++++++++
 4 files changed, 49 insertions(+)
 create mode 100644 srcpkgs/cloudflare-warp/files/cloudflare-warp/conf
 create mode 100755 srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run
 create mode 100755 srcpkgs/cloudflare-warp/files/cloudflare-warp/run
 create mode 100644 srcpkgs/cloudflare-warp/template

diff --git a/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf b/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf
new file mode 100644
index 000000000000..2cf4286aae64
--- /dev/null
+++ b/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf
@@ -0,0 +1,5 @@
+# Setting this to 1 enables logging, any other value - disables
+LOGGING_ENABLE=0
+
+# The directory will be created for you, if logging is enabled
+LOG_DIR="/var/log/warp"
diff --git a/srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run b/srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run
new file mode 100755
index 000000000000..f4f472e74410
--- /dev/null
+++ b/srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+[ -r ../conf ] && . ../conf
+
+if [ "$LOGGING_ENABLE" -eq 1 ]; then
+    if [ ! -d "$LOG_DIR" ]; then
+        mkdir -p "$LOG_DIR"
+    fi
+    exec svlogd -tt "$LOG_DIR"
+else
+    exec chpst -1
+fi
diff --git a/srcpkgs/cloudflare-warp/files/cloudflare-warp/run b/srcpkgs/cloudflare-warp/files/cloudflare-warp/run
new file mode 100755
index 000000000000..b53dfd210b33
--- /dev/null
+++ b/srcpkgs/cloudflare-warp/files/cloudflare-warp/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec warp-svc 2>&1
diff --git a/srcpkgs/cloudflare-warp/template b/srcpkgs/cloudflare-warp/template
new file mode 100644
index 000000000000..fc23ed297c4e
--- /dev/null
+++ b/srcpkgs/cloudflare-warp/template
@@ -0,0 +1,29 @@
+# Template file for 'cloudflare-warp'
+pkgname=cloudflare-warp
+version=2023.1.133
+revision=1
+archs="i686 x86_64"
+short_desc="Cloudflare Warp Client"
+maintainer="Andrew Shteren <dank.txt@gmail.com>"
+license="custom"
+homepage="https://1.1.1.1/"
+repository="nonfree"
+restricted="yes"
+nostrip="yes"
+
+debpkgid="cloudflare_warp_2023_1_133_1_amd64_734c1ff709.deb"
+distfiles="https://pkg.cloudflareclient.com/uploads/${debpkgid}"
+checksum="628d499db5e2f6f6d8600926c24e12ec9659138e52578a78741e7946dfb0f8b0"
+
+do_extract() {
+    ar x ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${debpkgid}
+    bsdtar xzpvf data.tar.gz
+}
+
+do_install() {
+    vbin bin/warp-svc
+    vbin bin/warp-taskbar
+    vbin bin/warp-diag
+    vbin bin/warp-cli
+    vsv cloudflare-warp
+}

From 2945c14cca38dd11bf936f9233844137f6d2677d Mon Sep 17 00:00:00 2001
From: 2trvl <38960745+2trvl@users.noreply.github.com>
Date: Wed, 1 Feb 2023 00:53:48 +0300
Subject: [PATCH 2/4] change log folder name according to service

---
 srcpkgs/cloudflare-warp/files/cloudflare-warp/conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf b/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf
index 2cf4286aae64..8d9441f6e941 100644
--- a/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf
+++ b/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf
@@ -2,4 +2,4 @@
 LOGGING_ENABLE=0
 
 # The directory will be created for you, if logging is enabled
-LOG_DIR="/var/log/warp"
+LOG_DIR="/var/log/cloudflare-warp"

From b1076e59b6c78cd4fa3306c2bedf72971d6efc93 Mon Sep 17 00:00:00 2001
From: 2trvl <38960745+2trvl@users.noreply.github.com>
Date: Wed, 1 Feb 2023 17:02:49 +0300
Subject: [PATCH 3/4] add service finish and update template

---
 .../files/cloudflare-warp/conf                |  4 ++--
 .../files/cloudflare-warp/finish              |  7 +++++++
 .../files/cloudflare-warp/log/run             |  2 +-
 .../cloudflare-warp/files/cloudflare-warp/run |  6 ++++++
 srcpkgs/cloudflare-warp/template              | 20 +++++++++----------
 5 files changed, 26 insertions(+), 13 deletions(-)
 create mode 100755 srcpkgs/cloudflare-warp/files/cloudflare-warp/finish

diff --git a/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf b/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf
index 8d9441f6e941..23ac77a23089 100644
--- a/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf
+++ b/srcpkgs/cloudflare-warp/files/cloudflare-warp/conf
@@ -1,5 +1,5 @@
 # Setting this to 1 enables logging, any other value - disables
-LOGGING_ENABLE=0
+LOGGING_ENABLED=0
 
-# The directory will be created for you, if logging is enabled
+# The directory in which to store log
 LOG_DIR="/var/log/cloudflare-warp"
diff --git a/srcpkgs/cloudflare-warp/files/cloudflare-warp/finish b/srcpkgs/cloudflare-warp/files/cloudflare-warp/finish
new file mode 100755
index 000000000000..17b10a3c4b1d
--- /dev/null
+++ b/srcpkgs/cloudflare-warp/files/cloudflare-warp/finish
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+[ -r ./conf ] && . ./conf
+
+if [ "$LOGGING_ENABLED" -eq 1 ]; then
+    sv down cloudflare-warp/log
+fi
diff --git a/srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run b/srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run
index f4f472e74410..05584efb82d3 100755
--- a/srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run
+++ b/srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run
@@ -2,7 +2,7 @@
 
 [ -r ../conf ] && . ../conf
 
-if [ "$LOGGING_ENABLE" -eq 1 ]; then
+if [ "$LOGGING_ENABLED" -eq 1 ]; then
     if [ ! -d "$LOG_DIR" ]; then
         mkdir -p "$LOG_DIR"
     fi
diff --git a/srcpkgs/cloudflare-warp/files/cloudflare-warp/run b/srcpkgs/cloudflare-warp/files/cloudflare-warp/run
index b53dfd210b33..a68b6d703227 100755
--- a/srcpkgs/cloudflare-warp/files/cloudflare-warp/run
+++ b/srcpkgs/cloudflare-warp/files/cloudflare-warp/run
@@ -1,3 +1,9 @@
 #!/bin/sh
 
+[ -r ./conf ] && . ./conf
+
+if [ "$LOGGING_ENABLED" -eq 1 ]; then
+    sv up cloudflare-warp/log
+fi
+
 exec warp-svc 2>&1
diff --git a/srcpkgs/cloudflare-warp/template b/srcpkgs/cloudflare-warp/template
index fc23ed297c4e..646b2ea989f4 100644
--- a/srcpkgs/cloudflare-warp/template
+++ b/srcpkgs/cloudflare-warp/template
@@ -5,25 +5,25 @@ revision=1
 archs="i686 x86_64"
 short_desc="Cloudflare Warp Client"
 maintainer="Andrew Shteren <dank.txt@gmail.com>"
-license="custom"
+license="Unknown"
 homepage="https://1.1.1.1/"
 repository="nonfree"
 restricted="yes"
 nostrip="yes"
 
-debpkgid="cloudflare_warp_2023_1_133_1_amd64_734c1ff709.deb"
-distfiles="https://pkg.cloudflareclient.com/uploads/${debpkgid}"
+_debpkgid="cloudflare_warp_2023_1_133_1_amd64_734c1ff709.deb"
+distfiles="https://pkg.cloudflareclient.com/uploads/$_debpkgid"
 checksum="628d499db5e2f6f6d8600926c24e12ec9659138e52578a78741e7946dfb0f8b0"
 
 do_extract() {
-    ar x ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${debpkgid}
-    bsdtar xzpvf data.tar.gz
+	ar x "${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_debpkgid}"
+	bsdtar xzpvf data.tar.gz
 }
 
 do_install() {
-    vbin bin/warp-svc
-    vbin bin/warp-taskbar
-    vbin bin/warp-diag
-    vbin bin/warp-cli
-    vsv cloudflare-warp
+	vbin bin/warp-svc
+	vbin bin/warp-taskbar
+	vbin bin/warp-diag
+	vbin bin/warp-cli
+	vsv cloudflare-warp
 }

From 71dd05ae02a20100a5803908937809baecd910ec Mon Sep 17 00:00:00 2001
From: 2trvl <38960745+2trvl@users.noreply.github.com>
Date: Wed, 1 Feb 2023 17:16:14 +0300
Subject: [PATCH 4/4] remove unused chpst

---
 srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run | 2 --
 1 file changed, 2 deletions(-)

diff --git a/srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run b/srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run
index 05584efb82d3..10cc5eef660f 100755
--- a/srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run
+++ b/srcpkgs/cloudflare-warp/files/cloudflare-warp/log/run
@@ -7,6 +7,4 @@ if [ "$LOGGING_ENABLED" -eq 1 ]; then
         mkdir -p "$LOG_DIR"
     fi
     exec svlogd -tt "$LOG_DIR"
-else
-    exec chpst -1
 fi