From 3cdd48c671885a6338e16111042d536bff9b6c74 Mon Sep 17 00:00:00 2001
From: Sarah Jamie Lewis <sarah@openprivacy.ca>
Date: Wed, 18 Jan 2023 14:49:21 -0800
Subject: [PATCH] Add file extract to scripts

---
 libcwtch.v1.10.2-linux.script   | 12 ++++++------
 libcwtch.v1.10.2-windows.script |  5 +++--
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/libcwtch.v1.10.2-linux.script b/libcwtch.v1.10.2-linux.script
index 0a150e0..52f435f 100644
--- a/libcwtch.v1.10.2-linux.script
+++ b/libcwtch.v1.10.2-linux.script
@@ -1,6 +1,4 @@
-mkfs -t ext4 /dev/vdb
-mkdir /mount
-mount -t auto /dev/vdb /mount
+@!setup-secondary
 cd /mount
 mkdir gopath
 mkdir /drone
@@ -8,7 +6,8 @@ wget https://go.dev/dl/go1.19.1.linux-amd64.tar.gz
 @!check go1.19.1.linux-amd64.tar.gz a69153393a2eaf1c2b77f5a4bafe6a2fb36368c6856d79bd697472af71d925fc62c58e6b8fe75adf143b0462da2ed9e68d0fcd0328cde091be70d745b92814aa
 tar -xzf go1.19.1.linux-amd64.tar.gz
 apt update
-apt install -y --no-install-recommends git wget libc6-dev make gcc
+apt install -y --no-install-recommends netcat git wget libc6-dev make gcc
+@!extract go1.19.1.linux-amd64.tar.gz
 ln -s /mount/go /usr/local/go
 ln -s /mount/gopath /go
 ln -s /mount/libcwtch-go /drone/src/
@@ -24,5 +23,6 @@ cd libcwtch-go
 echo `git describe --tags` > VERSION
 go mod download
 make linux
-@%sha512sum libCwtch.so
-@!check libCwtch.so b65c62ecf1c1ce6949d87b0e728d264a306ed3cabe011658a2c83cfde8277236ba8cf4722fa5df761050d06d24aae0d538434899ad338527b4e78032226f93eb
\ No newline at end of file
+sha512sum libCwtch.so
+@!check libCwtch.so b65c62ecf1c1ce6949d87b0e728d264a306ed3cabe011658a2c83cfde8277236ba8cf4722fa5df761050d06d24aae0d538434899ad338527b4e78032226f93eb
+@!extract libCwtch.so
\ No newline at end of file
diff --git a/libcwtch.v1.10.2-windows.script b/libcwtch.v1.10.2-windows.script
index 370a298..3d42231 100644
--- a/libcwtch.v1.10.2-windows.script
+++ b/libcwtch.v1.10.2-windows.script
@@ -11,7 +11,7 @@ wget https://go.dev/dl/go1.19.3.linux-amd64.tar.gz
 @!check go1.19.3.linux-amd64.tar.gz 1bf389df6d7efa6b54b04332c70356ee0d133753b1e58753e80ebafcff0f559c61223ddad3f5d024f0c538dbbd7d6ac92abb6b022f6a171a91a5ef39b0d82c9b
 tar -xzf go1.19.3.linux-amd64.tar.gz
 apt update
-apt install -y --no-install-recommends git wget libc6-dev make gcc g++ pkg-config g++-mingw-w64-x86-64
+apt install -y --no-install-recommends netcat git wget libc6-dev make gcc g++ pkg-config g++-mingw-w64-x86-64
 ln -s /mount/go /usr/local/go
 ln -s /mount/gopath /go
 ln -s /mount/libcwtch-go /drone/src/
@@ -29,4 +29,5 @@ echo `git describe --tags` > VERSION
 go mod download
 make windows
 sha512sum libCwtch.dll
-@!check libCwtch.dll 87743954bf7889045f73cdb4368416d4a2f6b41d61d3be420aace8c78e4ff6e6d93af8585d86be541788cf24de40de1dfc93e42772e265d4ca326b415ae793cc
\ No newline at end of file
+@!check libCwtch.dll 87743954bf7889045f73cdb4368416d4a2f6b41d61d3be420aace8c78e4ff6e6d93af8585d86be541788cf24de40de1dfc93e42772e265d4ca326b415ae793cc
+@!extract libCwtch.dll
\ No newline at end of file