From c4b2c06a11050f391ddb6fc2542708aebef32015 Mon Sep 17 00:00:00 2001 From: Daniele Scasciafratte Date: Wed, 19 Jun 2024 16:47:39 +0200 Subject: [PATCH 1/4] feat(install): improved symbolic link --- setup/install.ab | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/setup/install.ab b/setup/install.ab index 33fff8ad..5172bd1c 100644 --- a/setup/install.ab +++ b/setup/install.ab @@ -99,7 +99,7 @@ main(args) { exit(1) } - // Remove the archive + // Delete the archive ${sudo} rm {place}/{archive}$ failed { echo "Failed to remove downloaded archive at {place}/{archive}" exit(1) @@ -112,6 +112,13 @@ main(args) { exit(1) } + // Delete the previous symbolic link + ${sudo} rm "{bins_folder}/{target}" failed { + echo "Failed to remove the previous amber symbol link." + echo "Please make sure that root user can access /usr/local/bin directory." + exit(1) + } + // Create amber symbol link ${sudo} ln -s "{place}/{target}" "{bins_folder}/{target}"$ failed { echo "Failed to create amber symbol link." From 3b5e58d45be40644a9da34e345cde511a2248cbe Mon Sep 17 00:00:00 2001 From: Daniele Scasciafratte Date: Thu, 20 Jun 2024 10:28:08 +0200 Subject: [PATCH 2/4] check symbolic link exist before remove it --- setup/install.ab | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/setup/install.ab b/setup/install.ab index 5172bd1c..79b6e025 100644 --- a/setup/install.ab +++ b/setup/install.ab @@ -113,10 +113,12 @@ main(args) { } // Delete the previous symbolic link - ${sudo} rm "{bins_folder}/{target}" failed { - echo "Failed to remove the previous amber symbol link." - echo "Please make sure that root user can access /usr/local/bin directory." - exit(1) + if file_exist("{bins_folder}/{target}") { + ${sudo} rm "{bins_folder}/{target}" failed { + echo "Failed to remove the previous amber symbol link." + echo "Please make sure that root user can access /usr/local/bin directory." + exit(1) + } } // Create amber symbol link From 6f4a7cb2ea2c4a80e1e3344ff5ab11f4c686724f Mon Sep 17 00:00:00 2001 From: Daniele Scasciafratte Date: Fri, 21 Jun 2024 11:10:29 +0200 Subject: [PATCH 3/4] Update setup/install.ab Co-authored-by: blek! --- setup/install.ab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/install.ab b/setup/install.ab index 79b6e025..4eaeb1db 100644 --- a/setup/install.ab +++ b/setup/install.ab @@ -116,7 +116,7 @@ main(args) { if file_exist("{bins_folder}/{target}") { ${sudo} rm "{bins_folder}/{target}" failed { echo "Failed to remove the previous amber symbol link." - echo "Please make sure that root user can access /usr/local/bin directory." + echo "Please make sure that root user can access {bins_folder} directory." exit(1) } } From bfd72bf006d1c6bf14ad73bbe97eba8a0f4f3d21 Mon Sep 17 00:00:00 2001 From: Daniele Scasciafratte Date: Fri, 21 Jun 2024 11:11:12 +0200 Subject: [PATCH 4/4] Update install.ab --- setup/install.ab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/install.ab b/setup/install.ab index 4eaeb1db..9fb47b04 100644 --- a/setup/install.ab +++ b/setup/install.ab @@ -124,7 +124,7 @@ main(args) { // Create amber symbol link ${sudo} ln -s "{place}/{target}" "{bins_folder}/{target}"$ failed { echo "Failed to create amber symbol link." - echo "Please make sure that root user can access /usr/local/bin directory." + echo "Please make sure that root user can access {bins_folder} directory." exit(1) }