From ab3eb9877a16eb438234a04c5a48a98ecda94e4f Mon Sep 17 00:00:00 2001
From: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Sun, 20 May 2018 23:59:42 +0100
Subject: [PATCH] Fix builds

---
 .circleci/config.yml    | 30 +++++++++++++++---------------
 contrib/deb/generate.sh |  4 ++--
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 93aa264c..5773c6b1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -21,42 +21,42 @@ jobs:
       - run:
           name: Build for Linux (including Debian packages)
           command: |
-              PKGARCH=amd64 sh contrib/deb/generate.sh && mv yggdrasil yggdrasilctl /tmp/upload/$CINAME-$CIVERSION-linux-amd64;
-              PKGARCH=i386 sh contrib/deb/generate.sh && mv yggdrasil yggdrasilctl /tmp/upload/$CINAME-$CIVERSION-linux-i386;
-              PKGARCH=mipsel sh contrib/deb/generate.sh && mv yggdrasil yggdrasilctl /tmp/upload/$CINAME-$CIVERSION-linux-mipsel;
-              PKGARCH=mips sh contrib/deb/generate.sh && mv yggdrasil yggdrasilctl /tmp/upload/$CINAME-$CIVERSION-linux-mips;
-              PKGARCH=armhf sh contrib/deb/generate.sh && mv yggdrasil yggdrasilctl /tmp/upload/$CINAME-$CIVERSION-linux-armhf;
+              PKGARCH=amd64 sh contrib/deb/generate.sh && mv yggdrasil /tmp/upload/$CINAME-$CIVERSION-linux-amd64;
+              PKGARCH=i386 sh contrib/deb/generate.sh && mv yggdrasil /tmp/upload/$CINAME-$CIVERSION-linux-i386;
+              PKGARCH=mipsel sh contrib/deb/generate.sh && mv yggdrasil /tmp/upload/$CINAME-$CIVERSION-linux-mipsel;
+              PKGARCH=mips sh contrib/deb/generate.sh && mv yggdrasil /tmp/upload/$CINAME-$CIVERSION-linux-mips;
+              PKGARCH=armhf sh contrib/deb/generate.sh && mv yggdrasil /tmp/upload/$CINAME-$CIVERSION-linux-armhf;
               mv *.deb /tmp/upload/
 
       - run:
           name: Build for macOS
           command: |
-              GOOS=darwin GOARCH=amd64 ./build && mv yggdrasil yggdrasilctl /tmp/upload/$CINAME-$CIVERSION-darwin-amd64;
-              GOOS=darwin GOARCH=386 ./build && mv yggdrasil yggdrasilctl /tmp/upload/$CINAME-$CIVERSION-darwin-i386;
+              GOOS=darwin GOARCH=amd64 ./build && mv yggdrasil /tmp/upload/$CINAME-$CIVERSION-darwin-amd64;
+              GOOS=darwin GOARCH=386 ./build && mv yggdrasil /tmp/upload/$CINAME-$CIVERSION-darwin-i386;
 
       - run:
           name: Build for OpenBSD
           command: |
-              GOOS=openbsd GOARCH=amd64 ./build && mv yggdrasil yggdrasilctl /tmp/upload/$CINAME-$CIVERSION-openbsd-amd64;
-              GOOS=openbsd GOARCH=386 ./build && mv yggdrasil yggdrasilctl /tmp/upload/$CINAME-$CIVERSION-openbsd-i386;
+              GOOS=openbsd GOARCH=amd64 ./build && mv yggdrasil /tmp/upload/$CINAME-$CIVERSION-openbsd-amd64;
+              GOOS=openbsd GOARCH=386 ./build && mv yggdrasil /tmp/upload/$CINAME-$CIVERSION-openbsd-i386;
 
       - run:
           name: Build for FreeBSD
           command: |
-              GOOS=freebsd GOARCH=amd64 ./build && mv yggdrasil yggdrasilctl /tmp/upload/$CINAME-$CIVERSION-freebsd-amd64;
-              GOOS=freebsd GOARCH=386 ./build && mv yggdrasil yggdrasilctl /tmp/upload/$CINAME-$CIVERSION-freebsd-i386;
+              GOOS=freebsd GOARCH=amd64 ./build && mv yggdrasil /tmp/upload/$CINAME-$CIVERSION-freebsd-amd64;
+              GOOS=freebsd GOARCH=386 ./build && mv yggdrasil /tmp/upload/$CINAME-$CIVERSION-freebsd-i386;
 
       - run:
           name: Build for NetBSD
           command: |
-              GOOS=netbsd GOARCH=amd64 ./build && mv yggdrasil yggdrasilctl /tmp/upload/$CINAME-$CIVERSION-netbsd-amd64;
-              GOOS=netbsd GOARCH=386 ./build && mv yggdrasil yggdrasilctl /tmp/upload/$CINAME-$CIVERSION-netbsd-i386;
+              GOOS=netbsd GOARCH=amd64 ./build && mv yggdrasil /tmp/upload/$CINAME-$CIVERSION-netbsd-amd64;
+              GOOS=netbsd GOARCH=386 ./build && mv yggdrasil /tmp/upload/$CINAME-$CIVERSION-netbsd-i386;
 
       - run:
           name: Build for Windows
           command: |
-              GOOS=windows GOARCH=amd64 ./build && mv yggdrasil.exe yggdrasilctl.exe /tmp/upload/$CINAME-$CIVERSION-windows-amd64.exe;
-              GOOS=windows GOARCH=386 ./build && mv yggdrasil.exe yggdrasilctl.exe /tmp/upload/$CINAME-$CIVERSION-windows-i386.exe;
+              GOOS=windows GOARCH=amd64 ./build && mv yggdrasil.exe /tmp/upload/$CINAME-$CIVERSION-windows-amd64.exe;
+              GOOS=windows GOARCH=386 ./build && mv yggdrasil.exe /tmp/upload/$CINAME-$CIVERSION-windows-i386.exe;
 
       - run:
           name: Build for EdgeRouter
diff --git a/contrib/deb/generate.sh b/contrib/deb/generate.sh
index 860d4f1e..100e8cc7 100644
--- a/contrib/deb/generate.sh
+++ b/contrib/deb/generate.sh
@@ -54,7 +54,7 @@ cat > /tmp/$PKGNAME/debian/docs << EOF
 Please see https://github.com/Arceliar/yggdrasil-go/
 EOF
 cat > /tmp/$PKGNAME/debian/install << EOF
-usr/bin/yggdrasil usr/bin
+usr/bin/yggdrasil usr/bin/yggdrasilctl usr/bin
 etc/systemd/system/*.service etc/systemd/system
 EOF
 cat > /tmp/$PKGNAME/debian/postinst << EOF
@@ -74,7 +74,7 @@ cp contrib/systemd/yggdrasil.service /tmp/$PKGNAME/etc/systemd/system/
 cp contrib/systemd/yggdrasil-resume.service /tmp/$PKGNAME/etc/systemd/system/
 
 tar -czvf /tmp/$PKGNAME/data.tar.gz -C /tmp/$PKGNAME/ \
-  usr/bin/yggdrasil \
+  usr/bin/yggdrasil usr/bin/yggdrasilctl \
   etc/systemd/system/yggdrasil.service \
   etc/systemd/system/yggdrasil-resume.service
 tar -czvf /tmp/$PKGNAME/control.tar.gz -C /tmp/$PKGNAME/debian .