From 0209b0253fd9c8847aa3bca2057970dab5549df3 Mon Sep 17 00:00:00 2001
From: WolverinDEV <git@mcgalaxy.de>
Date: Fri, 5 Jul 2019 21:58:48 +0200
Subject: [PATCH] Finished build script

---
 jenkins/create_build.sh | 27 ++++++++++++++++++++++++++-
 jenkins/deploy_build.sh | 22 ----------------------
 2 files changed, 26 insertions(+), 23 deletions(-)
 delete mode 100755 jenkins/deploy_build.sh

diff --git a/jenkins/create_build.sh b/jenkins/create_build.sh
index 1603bbe..e1bd5a5 100755
--- a/jenkins/create_build.sh
+++ b/jenkins/create_build.sh
@@ -64,6 +64,31 @@ function compile_native() {
     end_task "${project_name}_native" "Native extensions compiled"
 }
 
+function package_client() {
+    begin_task "${project_name}_package" "Packaging client"
+    npm run build-linux-64
+    check_err_exit ${project_name} "Failed to package client!"
+    end_task "${project_name}_package" "Client package created"
+}
+
+function deploy_client() {
+    begin_task "${project_name}_package" "Deploying client"
+    [[ -z ${teaclient_deploy_secret} ]] && {
+        echo "Missing deploy secret. Dont deploy client!"
+        return 0
+    }
+    [[ -z ${teaclient_deploy_channel} ]] && {
+        echo "Missing deploy channel. Dont deploy client!"
+        return 0
+    }
+
+    npm run package-linux-64 ${teaclient_deploy_channel}
+    check_err_exit ${project_name} "Failed to deploying client!"
+    end_task "${project_name}_package" "Client successfully deployed!"
+}
+
 install_npm
 compile_scripts
-compile_native
\ No newline at end of file
+compile_native
+package_client
+deploy_client
\ No newline at end of file
diff --git a/jenkins/deploy_build.sh b/jenkins/deploy_build.sh
deleted file mode 100755
index cb50815..0000000
--- a/jenkins/deploy_build.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-
-cd "../$(dirname $0)"
-if [[ "${teaclient_deploy_secret}" == "" ]]; then
-    echo "Missing deploy secret!"
-    exit 1
-fi
-
-if [[ $# -lt 1 ]]; then
-    echo "Missing build channel!"
-    exit 1
-fi
-
-npm run build-linux-64
-if [[ $? -ne 0 ]]; then
-    echo "Failed to build project"
-fi
-
-npm run package-linux-64 $1
-if [[ $? -ne 0 ]]; then
-    echo "Failed to package project"
-fi
\ No newline at end of file