Fix symlinks and cleanup

1 files changed, 18 insertions, 6 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 451160bf18b9..8c868103ad72 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,5 @@
-# Maintainer: aksel <aksel@akseltorgard.com>
+# Maintainer: Kevin Stolp <kevinstolp@gmail.com>
+# Contributor: aksel <aksel@akseltorgard.com>
 
 pkgname=aws-sam-cli-bin
 pkgver=1.43.0
@@ -8,15 +9,26 @@ arch=("x86_64")
 url="https://github.com/aws/aws-sam-cli"
 license=("Apache")
 optdepends=("docker")
-source=("aws-sam-cli-linux-$pkgver-x86_64.zip::https://github.com/aws/aws-sam-cli/releases/download/v$pkgver/aws-sam-cli-linux-x86_64.zip")
-sha256sums=("5475e78ce0a27379a5cd69bbc868e0350bad4f74b2abfc1ddf1b9cfcfc9f40a8")
 provides=("aws-sam-cli")
 conflicts=("aws-sam-cli")
+source=("aws-sam-cli-linux-$pkgver-x86_64.zip::https://github.com/aws/aws-sam-cli/releases/download/v$pkgver/aws-sam-cli-linux-x86_64.zip")
+sha256sums=("5475e78ce0a27379a5cd69bbc868e0350bad4f74b2abfc1ddf1b9cfcfc9f40a8")
+
+_remove_pkgdir_from_link() {
+  local current_target="$(readlink "$1")"
+  rm "$1"
+  ln -s "${current_target#"$pkgdir"}" "$1"
+}
 
 package() {
-  # install
+  # Install
   $srcdir/install -i "$pkgdir/usr/share/aws-sam-cli" -b "$pkgdir/usr/bin" >/dev/null
 
-  # symlink the binary
-  ln -sf "/usr/share/aws-sam-cli/$pkgver/dist/sam" "$pkgdir/usr/bin/sam"
+  # Fix symlink for current version directory
+  _remove_pkgdir_from_link "$pkgdir/usr/share/aws-sam-cli/current"
+
+  # Fix symlinks in bin directory
+  for i in $pkgdir/usr/bin/*; do
+    _remove_pkgdir_from_link "$i"
+  done
 }