From f33ea96125c63e112cbef97de3b8376a38681e40 Mon Sep 17 00:00:00 2001
From: Jonas Gunz <himself@jonasgunz.de>
Date: Mon, 1 Jun 2020 19:54:40 +0200
Subject: added libs

---
 tasks/example            |  7 ++++++-
 tasks/initial-user-setup | 37 ++++++++++++-------------------------
 tasks/update             | 23 +++++++++++++++++++++++
 3 files changed, 41 insertions(+), 26 deletions(-)
 create mode 100644 tasks/update

(limited to 'tasks')

diff --git a/tasks/example b/tasks/example
index f5c8a9a..bc78361 100644
--- a/tasks/example
+++ b/tasks/example
@@ -10,10 +10,15 @@ function task_setup() {
 	# Available environment variables
 	# $ASSET_DIR
 	# $TOOL_DIR
-	
+	# $INCLUDE_DIR
+
+	INCLUDES+=()
+
 	SSH_USER=server
 	SSH_IDENTITY_FILE=$ASSET_DIR/id_rsa
 	
+	FILES+=()
+
 	TASK_ISSET="yes"
 }
 
diff --git a/tasks/initial-user-setup b/tasks/initial-user-setup
index fb402bb..de3aee9 100644
--- a/tasks/initial-user-setup
+++ b/tasks/initial-user-setup
@@ -1,18 +1,18 @@
 #!/bin/bash
 
+function task_setup() {
+	SSH_USER=root
+	SSH_IDENTITY_FILE=$ASSET_DIR/id_jenkins
+
+	FILES+=("$ASSET_DIR/id_user.pub" "$ASSET_DIR/id_jenkins.pub")
+	INCLUDES+=("pkgmanager")
+
+	TASK_ISSET="yes"
+}
+
 function task_exec() {
-	source /etc/os-release
-	case $ID in
-		arch)
-			pacman -Sy
-			INSTALL_CMD="pacman --noconfirm -S";;
-		debian)
-			apt update
-			INSTALL_CMD="apt-get install -y"
-	esac
-
-	PACKAGES="sudo vim git"
-	[ ! -z "$INSTALL_CMD" ] && $INSTALL_CMD $PACKAGES
+	pkg_update
+	pkg_install sudo
 
 	groupadd sudo
 	useradd -s /bin/bash -d /home/server -m -U -G sudo server
@@ -33,19 +33,6 @@ EOF
 	echo > /etc/motd
 }
 
-function task_setup() {
-	# Available environment variables
-	# $ASSET_DIR
-	# $TOOL_DIR
-	
-	SSH_USER=root
-	#SSH_IDENTITY_FILE=$ASSET_DIR/id_jenkins
-
-	FILES+=("$ASSET_DIR/id_user.pub" "$ASSET_DIR/id_jenkins.pub")
-
-	TASK_ISSET="yes"
-}
-
 if [ -z $HOSTMODE ]; then
 	task_exec
 else
diff --git a/tasks/update b/tasks/update
new file mode 100644
index 0000000..e392b76
--- /dev/null
+++ b/tasks/update
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+function task_exec() {
+	pkg_update
+	pkg_upgrade
+}
+
+function task_setup() {
+	INCLUDES+=("$INCLUDE_DIR/pkgmanager")
+
+	SSH_USER=server
+	#SSH_IDENTITY_FILE=$ASSET_DIR/id_rsa
+	
+	FILES+=()
+
+	TASK_ISSET="yes"
+}
+
+if [ -z $HOSTMODE ]; then
+	task_exec
+else
+	task_setup
+fi
-- 
cgit v1.2.3