Extract package resolution from package.sh

src/index.sh

@@ -1,4 +1,5 @@
 . "$TORI_ROOT/src/check.sh"
 . "$TORI_ROOT/src/configuration.sh"
-. "$TORI_ROOT/src/package.sh"
+. "$TORI_ROOT/src/package/package.sh"
+. "$TORI_ROOT/src/package/package_resolution.sh"
 . "$TORI_ROOT/src/utility.sh"

src/package/package.sh

@@ -0,0 +1,27 @@
+# package management functions
+
+get_user_packages() {
+	cat $CONFIG_ROOT/packages | sort | uniq
+}
+
+package_manager() {
+	local command="$1"
+	local manager
+	local args__get_manually_installed
+	local output
+
+	if [ $OS = "FreeBSD" ]; then
+		manager="pkg"
+		args__get_manually_installed='query -e "%a = 0" "%n"'
+	fi
+
+	if [ "$command" = 'get_manually_installed' ]; then
+		output=$(eval $manager $args__get_manually_installed)
+		printf "$output"
+	fi
+}
+
+get_system_packages() {
+	local packages=$(package_manager get_manually_installed)
+	printf "$packages"
+}

src/package/package_resolution.sh

@@ -1,31 +1,3 @@
-# package management functions
-
-get_user_packages() {
-	cat $CONFIG_ROOT/packages | sort | uniq
-}
-
-package_manager() {
-	local command="$1"
-	local manager
-	local args__get_manually_installed
-	local output
-
-	if [ $OS = "FreeBSD" ]; then
-		manager="pkg"
-		args__get_manually_installed='query -e "%a = 0" "%n"'
-	fi
-
-	if [ "$command" = 'get_manually_installed' ]; then
-		output=$(eval $manager $args__get_manually_installed)
-		printf "$output"
-	fi
-}
-
-get_system_packages() {
-	local packages=$(package_manager get_manually_installed)
-	printf "$packages"
-}
-
 resolve_packages() {
 	local strategy=
 
@@ -50,6 +22,8 @@ resolve_packages() {
 
 		if [ "$strategy" = 1 ]; then
 			: # TODO
+		elif [ $strategy -eq 6 ]; then
+			return 0
 		fi
 	fi
 
@@ -68,6 +42,8 @@ resolve_packages() {
 
 		if [ $strategy -eq 1 ]; then
 			: # TODO
+		elif [ $strategy -eq 6 ]; then
+			return 0
 		fi
 	fi
 }