From 3f313532881ff9c2a0e189a4eead51f20bd6f716 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sat, 21 Jan 2023 22:08:45 -0500
Subject: linhes-dev: mp.py: remove old pkgs using pkglist

---
 linhes/linhes-dev/PKGBUILD        |  6 +++---
 linhes/linhes-dev/lh_setup_dev.sh |  1 +
 linhes/linhes-dev/mp.py           | 18 +++++++++---------
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/linhes/linhes-dev/PKGBUILD b/linhes/linhes-dev/PKGBUILD
index d8718e2..c7e559a 100644
--- a/linhes/linhes-dev/PKGBUILD
+++ b/linhes/linhes-dev/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=linhes-dev
 pkgver=9.0.0
-pkgrel=12
+pkgrel=13
 pkgdesc="Scripts to develop LinHES"
 arch=('x86_64')
 license=('GPL2')
@@ -10,8 +10,8 @@ url="http://linhes.org/"
 source=('lh_sync.sh' 'chk_aur_pkg.py' 'mp.py' 'lh_setup_dev.sh' 'lh_update_db_repo.sh')
 sha256sums=('3a64b4125b56c6f95cc9dc85ce58ebd1c0612b22fb27c3e76d4d9a5570f2d61e'
             '864192e9fe627c5a85d4c33ba30df7c870783a450f5fea7c550dd9490d48f2ab'
-            '7a6686291bd0e3f4da7d7fbe4dda2022004f5275aebec173eabd97fccff2275c'
-            'ce73a80d8337a57a3ee3460524848706b44f73111dfde39042e28d5a6892bfe4'
+            '025776558632dc60da5a97cc66a4fb52b31882eff7aeaf5476a8e40107e39a87'
+            '6351971bb5249c7be7af4e0bfee0e06842ef671fb9ef71458bf0650be6634fad'
             '86c9ebe77228f7e3cc07cb05f480e5584e0e3cad1b889b63a50821f7323bf449')
 
 package() {
diff --git a/linhes/linhes-dev/lh_setup_dev.sh b/linhes/linhes-dev/lh_setup_dev.sh
index 918f9e8..4c0bcd1 100755
--- a/linhes/linhes-dev/lh_setup_dev.sh
+++ b/linhes/linhes-dev/lh_setup_dev.sh
@@ -45,6 +45,7 @@ if ! grep -q 'ssh-agent >' ~/.bashrc; then
 cat >> ~/.bashrc<<END
 if ! pgrep -u "\$USER" ssh-agent > /dev/null; then
     ssh-agent > "\$XDG_RUNTIME_DIR/ssh-agent.env"
+    ssh-add -q
 fi
 if [[ ! -f "\$SSH_AUTH_SOCK" ]]; then
     source "\$XDG_RUNTIME_DIR/ssh-agent.env" >/dev/null
diff --git a/linhes/linhes-dev/mp.py b/linhes/linhes-dev/mp.py
index f8d660b..4124b79 100755
--- a/linhes/linhes-dev/mp.py
+++ b/linhes/linhes-dev/mp.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Version 3.0.3
+# Version 3.0.4
 import os
 import stat
 import sys
@@ -323,14 +323,14 @@ class Packagefile(object):
 
     def make_package(self):
         #creates both binary and source package
-        print("   Removing symlinks...")
-        pkglinks = glob.glob(self.pkgname + "*.pkg.tar.*")
-        print("    Old Symlinks:",pkglinks)
-        if pkglinks:
-            for DELLNK in pkglinks:
-                if os.path.islink(DELLNK):
-                    print("    Deleting old symlink:",DELLNK)
-                    os.unlink(DELLNK)
+        print("   Removing old packages...")
+        for oldpkgs in self.pkglist:
+            pkglinks = glob.glob(oldpkgs + "*.pkg.tar.*")
+            print("    Old Packages:",pkglinks)
+            if pkglinks:
+                for DELPKG in pkglinks:
+                    os.remove(DELPKG)
+
         print("-  Making package...")
         retcode = subprocess.call(["sudo", "ccm", "s"])
         if retcode != 0:
-- 
cgit v0.12

