From 14c86590f2e0f62a3c5e16a3416eafa82387c710 Mon Sep 17 00:00:00 2001
From: Marco Vermeulen <vermeulen.mp@gmail.com>
Date: Sun, 22 Aug 2021 11:34:38 +0100
Subject: [PATCH] Revert "Extract custom archive tasks to gradle folder."

This reverts commit ee6a5e23f3d20898bbc3eb16bd1e24e7382f8180.
---
 build.gradle          | 75 +++++++++++++++++++++++++++++++++++++++++--
 gradle/archive.gradle | 39 ----------------------
 2 files changed, 73 insertions(+), 41 deletions(-)
 delete mode 100644 gradle/archive.gradle

diff --git a/build.gradle b/build.gradle
index 9e23e9216..8bebed140 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,3 +1,7 @@
+import org.apache.tools.ant.filters.ReplaceTokens
+
+import static org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL
+
 plugins {
 	id('groovy')
 }
@@ -20,8 +24,6 @@ println("Release set to: $release")
 println("Candidtes API: $candidatesApi")
 println("Version: $sdkmanVersion")
 
-apply from: 'gradle/archive.gradle'
-
 repositories {
 	mavenCentral()
 }
@@ -43,3 +45,72 @@ dependencies {
 		exclude module: 'groovy-all'
 	}
 }
+
+task prepareScripts(type: Copy) {
+	from('src/main/bash')
+	into('build/scripts')
+	include('**/*')
+	filter(
+			ReplaceTokens,
+			tokens: [
+					SDKMAN_VERSION       : sdkmanVersion,
+					SDKMAN_CANDIDATES_API: candidatesApi
+			]
+	)
+}
+
+task prepareContrib(type: Copy) {
+	from('contrib')
+	into('build/contrib')
+}
+
+tasks.test.configure {
+	dependsOn(prepareScripts)
+	testLogging.exceptionFormat = FULL
+}
+
+task assembleArchive(type: Zip, dependsOn: [prepareScripts, prepareContrib]) {
+	archiveVersion = sdkmanVersion
+	from('build/scripts') {
+		include('*.sh*')
+	}
+	from('build') {
+		include('contrib/**')
+	}
+}
+
+tasks.assemble.configure {
+	dependsOn(assembleArchive)
+}
+
+task cleanInstallInit(type: Delete) {
+	delete(installBinDir)
+}
+
+task cleanContribInit(type: Delete) {
+	delete(installContribDir)
+}
+
+task cleanInstallModules(type: Delete) {
+	delete(installSrcDir)
+}
+
+task installContrib(type: Copy, dependsOn: [cleanContribInit, prepareContrib]) {
+	from('build/contrib')
+	into(installContribDir)
+}
+
+task installInit(type: Copy, dependsOn: [cleanInstallInit, prepareScripts]) {
+	from('build/scripts')
+	into(installBinDir)
+	include('sdkman-init.sh')
+}
+
+task installModules(type: Copy, dependsOn: [cleanInstallModules, prepareScripts]) {
+	from('build/scripts')
+	into(installSrcDir)
+	include('sdkman-*.sh')
+	exclude('sdkman-init.sh')
+}
+
+task install(dependsOn: [installInit, installContrib, installModules])
diff --git a/gradle/archive.gradle b/gradle/archive.gradle
deleted file mode 100644
index a6a8b7c65..000000000
--- a/gradle/archive.gradle
+++ /dev/null
@@ -1,39 +0,0 @@
-import org.apache.tools.ant.filters.ReplaceTokens
-import org.gradle.api.tasks.testing.logging.TestExceptionFormat
-
-task prepareScripts(type: Copy) {
-	from('src/main/bash')
-	into('build/scripts')
-	include('**/*')
-	filter(
-			ReplaceTokens,
-			tokens: [
-					SDKMAN_VERSION       : sdkmanVersion,
-					SDKMAN_CANDIDATES_API: candidatesApi
-			]
-	)
-}
-
-task prepareContrib(type: Copy) {
-	from('contrib')
-	into('build/contrib')
-}
-
-tasks.test.configure {
-	dependsOn(prepareScripts)
-	testLogging.exceptionFormat = TestExceptionFormat.FULL
-}
-
-task assembleArchive(type: Zip, dependsOn: [prepareScripts, prepareContrib]) {
-	archiveVersion = sdkmanVersion
-	from('build/scripts') {
-		include('*.sh*')
-	}
-	from('build') {
-		include('contrib/**')
-	}
-}
-
-tasks.assemble.configure {
-	dependsOn(assembleArchive)
-}