feat(package): add instruction postinstall

yunielrc · Sep 13, 2023 · 9cb6f27 · 9cb6f27
1 parent 3b374df
commit 9cb6f27
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 3 deletions.
diff --git a/src/usr/lib/ydf/components/package/ydf-package-service.bash b/src/usr/lib/ydf/components/package/ydf-package-service.bash
@@ -29,8 +29,8 @@ fi
 # readonly __YDF_PACKAGE_SERVICE_INSTRUCTIONS_UBUNTU="preinstall apt install postinstall ${__YDF_PACKAGE_SERVICE_INSTRUCTIONS_COMMON}"
 
 readonly __YDF_PACKAGE_SERVICE_INSTRUCTIONS_COMMON=''
-readonly __YDF_PACKAGE_SERVICE_INSTRUCTIONS_MANJARO="preinstall install ${__YDF_PACKAGE_SERVICE_INSTRUCTIONS_COMMON}"
-readonly __YDF_PACKAGE_SERVICE_INSTRUCTIONS_UBUNTU="preinstall install ${__YDF_PACKAGE_SERVICE_INSTRUCTIONS_COMMON}"
+readonly __YDF_PACKAGE_SERVICE_INSTRUCTIONS_MANJARO="preinstall install postinstall ${__YDF_PACKAGE_SERVICE_INSTRUCTIONS_COMMON}"
+readonly __YDF_PACKAGE_SERVICE_INSTRUCTIONS_UBUNTU="preinstall install postinstall ${__YDF_PACKAGE_SERVICE_INSTRUCTIONS_COMMON}"
 
 #
 # FUNCTIONS
@@ -104,6 +104,21 @@ ydf::package_service::__instruction_install() {
   bash ./install
 }
 
+#
+# Execute preinstall script
+#
+#
+# Returns:
+#   0 on success, non-zero on error.
+#
+ydf::package_service::__instruction_postinstall() {
+  if [[ ! -f ./postinstall ]]; then
+    return 0
+  fi
+
+  bash ./postinstall
+}
+
 #
 # Install a ydotfile package from a directory
 #

diff --git a/tests/fixtures/packages/4postinstall/install b/tests/fixtures/packages/4postinstall/install
@@ -0,0 +1 @@
+echo '4postinstall: install succeed'
diff --git a/tests/fixtures/packages/4postinstall/postinstall b/tests/fixtures/packages/4postinstall/postinstall
@@ -0,0 +1 @@
+echo '4postinstall: postinstall succeed'
diff --git a/tests/fixtures/packages/4postinstall/preinstall b/tests/fixtures/packages/4postinstall/preinstall
@@ -0,0 +1 @@
+echo '4postinstall: preinstall succeed'
diff --git a/tests/usr/lib/ydf/components/package/ydf-package-command.f.bats b/tests/usr/lib/ydf/components/package/ydf-package-command.f.bats
@@ -77,7 +77,7 @@ ydf package COMMAND'
 
 # Tests for ydf package install ../3install
 @test "ydf package install --os manjaro ../3install, Should succeed With no install script" {
-  local -r _package_dir="${TEST_FIXTURES_DIR}/packages"
+  local -r _package_dir="${TEST_FIXTURES_DIR}/packages/0empty"
 
   run ydf package install --os manjaro "$_package_dir"
 
@@ -94,3 +94,15 @@ ydf package COMMAND'
   assert_output "3install: preinstall succeed
 3install: install succeed"
 }
+
+# Tests for ydf package install ../4postinstall
+@test "ydf package install ../4postinstall, Should succeed" {
+  local -r _package_dir="${TEST_FIXTURES_DIR}/packages/4postinstall"
+
+  run ydf package install "$_package_dir"
+
+  assert_success
+  assert_output "4postinstall: preinstall succeed
+4postinstall: install succeed
+4postinstall: postinstall succeed"
+}
diff --git a/tests/usr/lib/ydf/components/package/ydf-package-service.bats b/tests/usr/lib/ydf/components/package/ydf-package-service.bats
@@ -191,3 +191,14 @@ preinstall"
   assert_success
   assert_output "3install: install succeed"
 }
+
+# Tests for ydf::package_service::__instruction_postinstall()
+@test "ydf::package_service::__instruction_postinstall() Should succeed" {
+
+  cd "${TEST_FIXTURES_DIR}/packages/4postinstall"
+
+  run ydf::package_service::__instruction_postinstall
+
+  assert_success
+  assert_output "4postinstall: postinstall succeed"
+}