Tried to amend single commentary for many files: New vbox module

[not complete]
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts

Conflicts:
	helper/fileutil.inc

1 files changed, 1 insertions, 35 deletions

diff --git a/remote/setup_target b/remote/setup_target
index c19113df..9db5ba20 100755
--- a/remote/setup_target
+++ b/remote/setup_target
@@ -58,41 +58,7 @@ EXPORT_DIR="/export/build"
 PROCESSED_MODULES=""
 
 initial_checks () {
-	# Set up distribution and package management
-	# Lowercase distributor ID is what we use as the general distribution name
-	SYS_DISTRIBUTION=$(lsb_release -is | tolower | sed -r 's/[^a-z0-9]//g;s/project$//g;s/scientificsl$/scientific/g')
-	# Then determine packet manager
-	case "$SYS_DISTRIBUTION" in
-	ubuntu|debian)
-		PACKET_MANAGER="apt"
-		PACKET_HANDLER="dpkg"
-		;;
-	opensuse)
-		PACKET_MANAGER="zypper"
-		PACKET_HANDLER="rpm"
-		;;
-	scientific)
-		PACKET_MANAGER="yum"
-		PACKET_HANDLER="rpm"
-		;;
-	*)
-		perror "Unknown Distribution: $SYS_DISTRIBUTION - Please specify its packet manager in remote/setup_target"
-		;;
-	esac
-	# Get version - we mangle this quite a bit. first make sure it has no spaces, then split version at period (.), underscore (_) and dash (-)
-	SYS_VERSION=$(lsb_release -rs | tolower)
-	local VERSION=$(echo $SYS_VERSION | sed -r 's/\s//g;s/[\._]/ /g;s/-//g')
-	local STRTMP=""
-	PRINT_SYS_VERSIONS="*.conf.$SYS_DISTRIBUTION"
-	SYS_VERSIONS="$SYS_DISTRIBUTION"
-	for PART in $VERSION; do
-		[ -z "$PART" ] && continue
-		STRTMP+=".$PART"
-		SYS_VERSIONS="${SYS_DISTRIBUTION}${STRTMP} $SYS_VERSIONS"
-		PRINT_SYS_VERSIONS="*.conf.${SYS_DISTRIBUTION}${STRTMP} $PRINT_SYS_VERSIONS"
-	done
-	pinfo "Config source order: *.conf first, then the first one of these (if found)"
-	pinfo "$PRINT_SYS_VERSIONS"
+	detect_distribution
 }
 
 #