From 4611d2c427134cdfdd3b2e6d8f1a777eeaaccafe Mon Sep 17 00:00:00 2001
From: raffis <sahli@gyselroth.com>
Date: Wed, 21 Nov 2018 12:06:11 +0100
Subject: [PATCH] fixes build

---
 Makefile                      | 28 ++++++++++++++--------------
 package.json                  |  2 +-
 packaging/debian/bintray.json |  2 +-
 packaging/debian/control      |  2 +-
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/Makefile b/Makefile
index 01765e6..9893bf3 100644
--- a/Makefile
+++ b/Makefile
@@ -13,16 +13,16 @@ VERSION := "0.0.1"
 endif
 
 # PACKAGES
-DEB = $(DIST_DIR)/tubeectl-$(VERSION).deb
+DEB = $(DIST_DIR)/tubectl-$(VERSION).deb
 
 # NPM STUFF
 NPM_BIN = npm
 
 # TARGET ALIASES
-INSTALL_TARGET = "$(INSTALL_PREFIX)/tubeectl"
+INSTALL_TARGET = "$(INSTALL_PREFIX)/tubectl"
 NPM_TARGET = $(NODE_MODULES_DIR)
 CHANGELOG_TARGET = $(PACK_DIR)/DEBIAN/changelog
-BUILD_TARGET = $(BUILD_DIR) $(DIST_DIR)/tubeectl
+BUILD_TARGET = $(BUILD_DIR) $(NPM_TARGET)
 
 # TARGETS
 .PHONY: all
@@ -44,8 +44,8 @@ mostlyclean:
 deps: npm
 
 
-.PHONY: build
-build: $(BUILD_TARGET)
+#.PHONY: build
+#build: $(BUILD_TARGET)
 
 
 .PHONY: dist
@@ -53,15 +53,15 @@ dist: deb
 
 
 .PHONY: deb
-deb: $(DIST_DIR)/tubeectl-$(VERSION).deb
+deb: $(DIST_DIR)/tubectl-$(VERSION).deb
 
-$(DIST_DIR)/tubeectl-$(VERSION).deb: $(CHANGELOG_TARGET) $(BUILD_TARGET)
+$(DIST_DIR)/tubectl-$(VERSION).deb: $(CHANGELOG_TARGET) $(BUILD_TARGET)
 	@-test ! -d $(PACK_DIR) || rm -rfv $(PACK_DIR)
 	@mkdir -p $(PACK_DIR)/DEBIAN
 	@cp $(BASE_DIR)/packaging/debian/control $(PACK_DIR)/DEBIAN/control
 	@sed -i s/'{version}'/$(VERSION)/g $(PACK_DIR)/DEBIAN/control
 	@mkdir -p $(PACK_DIR)/$(INSTALL_PREFIX)
-	@cp  $(DIST_DIR)/tubeectl $(PACK_DIR)/$(INSTALL_PREFIX)
+	@cp  $(DIST_DIR)/tubectl $(PACK_DIR)/$(INSTALL_PREFIX)
 	@-test -d $(DIST_DIR) || mkdir $(DIST_DIR)
 	@dpkg-deb --build $(PACK_DIR) $@
 	@rm -rf $(PACK_DIR)
@@ -85,7 +85,7 @@ $(CHANGELOG_TARGET): CHANGELOG.md
 		then \
 	 		if [ "$$v" != "" ]; \
 	 		then \
-	 			echo "tubeectl ($$v) $$stable; urgency=low" >> $@; \
+	 			echo "tubectl ($$v) $$stable; urgency=low" >> $@; \
 	 			echo -e "$$changes" >> $@; \
 	 			echo >>  $@; \
 	 			echo " -- $$author  $$date" >> $@; \
@@ -140,12 +140,12 @@ $(NPM_TARGET) : $(BASE_DIR)/package.json
 	@touch $@
 
 
-.PHONY: pack
-pack: $(BUILD_TARGET)
+.PHONY: build
+build: $(BUILD_TARGET)
 
 $(BUILD_TARGET) : $(BASE_DIR)/build
 	@test "`$(NPM_BIN) install --dry-run 2>&1 >/dev/null | grep Failed`" == ""
-	$(NPM_BIN) run pack
+	$(NPM_BIN) run build
 	@touch $@
 
 
@@ -153,5 +153,5 @@ $(BUILD_TARGET) : $(BASE_DIR)/build
 install: $(INSTALL_TARGET)
 
 $(INSTALL_TARGET): $(BUILD_TARGET)
-	@cp -Rp $(DIST_DIR)/tubeectl $(INSTALL_PREFIX)/tubeectl
-	@chmod +x $(INSTALL_PREFIX)/tubeectl
+	@cp -Rp $(DIST_DIR)/tubectl $(INSTALL_PREFIX)/tubectl
+	@chmod +x $(INSTALL_PREFIX)/tubectl
diff --git a/package.json b/package.json
index d0f6613..5d880df 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
     "start": "tsc && node build/main.js",
     "format": "prettier --write \"src/**/*.ts\" \"src/**/*.js\"",
     "lint": "tslint --fix -p tsconfig.json",
-    "build": "npm run format && npm run prebuild && npm run coveralls",
+    "build": "npm run format && npm run prebuild",
     "test": "jest --coverage",
     "coveralls": "coveralls < coverage/lcov.info",
     "dist-linux": "nexe --verbose -r ./node_modules/@gyselroth/tubee-sdk-node/swagger.yml -i build/main.js -o dist/tubectl -t linux-x64-8.12.0",
diff --git a/packaging/debian/bintray.json b/packaging/debian/bintray.json
index 691b7ca..cea7925 100644
--- a/packaging/debian/bintray.json
+++ b/packaging/debian/bintray.json
@@ -1,6 +1,6 @@
 {
     "package": {
-        "name": "tubeectl",
+        "name": "tubectl",
         "repo": "tubee",
         "subject": "gyselroth",
         "desc": "tubee console client",
diff --git a/packaging/debian/control b/packaging/debian/control
index 3b7600a..e904878 100644
--- a/packaging/debian/control
+++ b/packaging/debian/control
@@ -1,4 +1,4 @@
-Package: tubeectl
+Package: tubectl
 Version: {version}
 Architecture: all
 Maintainer: Raffael Sahli <sahli@gyselroth.com>