pman

commit ede07ab85f45eac7f34a6d07f3e51d6462eea052

Author: Connor Etherington <[email protected]>

Date:   Mon May 16 06:41:22 2022 +0200

    Update.

---

 PKGBUILD    | 15 +++++++++++++--

 usr/bin/pkd | 35 ++++++++++++++++++-----------------

 2 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD

index 0a8bd9d..89b377e 100644

--- a/PKGBUILD

+++ b/PKGBUILD

@@ -16,8 +16,19 @@ optdepends=(

   "python-pip: To download python packages."

   "aria2: To download files or torrents from URLs."

   )

-source=("git+$url.git")

-sha256sums=('SKIP')

+source=(

+  "https://concise.cc/pkg/${pkgname}-${pkgver}-${pkgrel}-$arch.pkg.tar.zst"

+  "https://concise.cc/pkg/${pkgname}-${pkgver}-${pkgrel}-$arch.pkg.tar.zst.sig"

+  )

+sha512sums=(

+  '01a68e743d6b22cd1eb6d70dcb9324205feb8acaef9b86fe8c0efa7c315132bc74cddae5755de121266060a510bbdb9f1a0c4aec75a7b0e634a6a9f93357e2c4'

+  '9df69caddd1e224e3ecfc08978f9fe7fe19467df9c167824f8d649a646f5c00d8793777d576d1043710a62ae7347f1e28c079f47f003cb14e67eebd9e0290fb8'

+  )

+md5sums=(

+  'f39efddd7c3cd63c97496ce99e3d7000'

+  '8f73fd2f4b11d523c9b8d92b326fef8f'

+  )

+validpgpkeys=('81BACEEBC3EA26E127166E4A819BB92A9A48160E')

 package() {

     install -Dm644 usr/share/licenses/${pkgname}/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"

diff --git a/usr/bin/pkd b/usr/bin/pkd

index 08e0925..41e9ceb 100755

--- a/usr/bin/pkd

+++ b/usr/bin/pkd

@@ -7,7 +7,7 @@ TITLE=" ~ Automate Download Helper ~ "

 multiDownlist=$(mktemp -uq)

-trap 'sudo rm -f ${multiDownlist} /tmp/total.tmp >/dev/null 2>&1' EXIT INT TERM HUP QUIT  >/dev/null 2>&1

+trap 'sudo rm -f ${multiDownlist} /tmp/total.tmp >/dev/null 2>&1' EXIT TERM QUIT  >/dev/null 2>&1

 cat <<-EOF > ${multiDownlist}

 ##  PLEASE ENTER YOUR DESIRED SOURCES AND PACKAGES BELOW :  ( No source assumes pkg is in package database or AUR )

@@ -63,7 +63,7 @@ color3="yellow"    # Package Description

 EOF

-name="$(echo "$USER")"

+name="$(echo "${USER}")"

 [ -n $(echo $color1) ] || [ ! $color1 ] && color1=blue

@@ -96,11 +96,11 @@ scrstart()    { clear ; echo -e "\n\n" ; green "   Downloading Packages : " ; ec

   red "\n [-] ERROR: Could Not Find '"$1"'\n\n" ; }

-npminstall()  { sudo -u "$name" npm install -g "$1" "$npmd"/"$pkg" >/dev/null 2>&1 || 

+npminstall()  { sudo npm install -g "$1" >/dev/null 2>&1 && return 0 || 

   ! sudo pacman -Qq npm >/dev/null 2>&1 && err "NPM is not installed. Please install it and try again."  ||

   red "\n [-] ERROR: Could Not Find '"$1"' in NPM database.\n\n" ; }

-snpinstall()  { sudo -u "$name" snap install "$1" >/dev/null 2>&1 || 

+snpinstall()  { sudo snap install "$1" >/dev/null 2>&1 && return 0 || 

   ! sudo pacman -Qq snapd >/dev/null 2>&1 && err "Snapd is not installed. Please install it and try again." ||

   red "\n [-] ERROR: Could Not Find '"$1"'in Snap database.\n\n" ; }

@@ -109,31 +109,31 @@ pkginstall()  { ${helper} -S --needed --noconfirm "$1" >/dev/null 2>&1 && return

   red "\n [-] Errors occurred during install of ${1}. Most likely due to conflicting packages.\n\n" ||

   red "\n [-] ERROR: '"$1"' could not be found in package database.\n\n" ; }

-pipinstall()  { sudo -u "$name" python3 -m pip install "$1" "$pipd"/"$pkg" >/dev/null 2>&1 || 

+pipinstall()  { sudo python3 -m pip install "$1" >/dev/null 2>&1 && return 0 || 

   ! sudo pacman -Qq python-pip >/dev/null 2>&1 && err "Python-pip is not installed. Please install it and try again." ||

   red "\n [-] ERROR: Could Not Find '"$1"' in Python database.\n\n" ; }

-flatinstall()  { sudo -u "$name" flatpak install -y "$1" >/dev/null 2>&1 ||

+flatinstall()  { sudo flatpak install -y "$1" >/dev/null 2>&1 && return 0 ||

   ! sudo pacman -Qq flatpak >/dev/null 2>&1 && err "Flatpak is not installed. Please install it and try again." ||

   red "\n [-] ERROR: Could Not Find '"$1"' in Flatpak database.\n\n" ; }

-labclone()    { git clone https://gitlab.com/"$1".git \

+labclone()    { git clone https://gitlab.com/"$1".git >/dev/null 2>&1 && return 0 ||

   ! sudo pacman -Qq git >/dev/null 2>&1 && err "Git is not installed. Please install it and try again." ||

-   >/dev/null 2>&1 || red "\n [-] ERROR: Could Not Find '"$1"' Git repo.\n\n" ; }

+   red "\n [-] ERROR: Could Not Find '"$1"' Git repo.\n\n" ; }

-mylabclone()  { git clone https://gitlab.com/"$labname"/"$(basename $1)".git \

+mylabclone()  { git clone https://gitlab.com/"$labname"/"$(basename $1)".git >/dev/null 2>&1 && return 0 ||

   ! sudo pacman -Qq git >/dev/null 2>&1 && err "Git is not installed. Please install it and try again." ||

-   >/dev/null 2>&1 || red "\n [-] ERROR: Could Not Find '"$1"' Git repo.\n\n" ; }

+   red "\n [-] ERROR: Could Not Find '"$1"' on Gitlab.\n\n" ; }

-myhubclone()  { git clone https://github.com/"$hubname"/"$(basename $1)".git \

+myhubclone()  { git clone https://github.com/"$hubname"/"$(basename $1)".git >/dev/null 2>&1 && return 0 ||

   ! sudo pacman -Qq git >/dev/null 2>&1 && err "Git is not installed. Please install it and try again." ||

-   >/dev/null 2>&1 || red "\n [-] ERROR: Could Not Find '"$1"' Git repo.\n\n" ; }

+   red "\n [-] ERROR: Could Not Find '"$1"' on Github.\n\n" ; }

-hubclone()    { git clone https://github.com/"$1".git \

+hubclone()    { git clone https://github.com/"$1".git >/dev/null 2>&1 && return 0 ||

   ! sudo pacman -Qq git >/dev/null 2>&1 && err "Git is not installed. Please install it and try again." ||

-   >/dev/null 2>&1 || red "\n [-] ERROR: Could Not Find '"$1"' Git repo.\n\n" ; }

+   red "\n [-] ERROR: Could Not Find '"$1"' Git repo.\n\n" ; }

-lnOrTorrent() { aria2c "${1}" >/dev/null 2>&1 || 

+lnOrTorrent() { aria2c "${1}" >/dev/null 2>&1 && return 0 || 

   ! sudo pacman -Qq aria2 >/dev/null 2>&1 && err "NPM is not installed. Please install it and try again." ||

   red "\n [-] ERROR: "$1", Could not be download.\n\n" ; }

@@ -296,8 +296,6 @@ esac

 [ -z $packages ] && err "No packages specified ..."

-[ -f /tmp/total.tmp ] && rm /tmp/total.tmp

-

 for x in  "${packages[@]}" ; do  

   echo $x >> /tmp/total.tmp 

@@ -322,6 +320,9 @@ while IFS=, read -r src pkg desc viewName ; do

   [[ ${src} == 'W' ]] && [[ -z ${desc} ]] && desc="Downloading Link..."

+  [[ ${src} == 'MH' ]] && [[ -z ${desc} ]] && desc="Cloning Repo from ${hubname}'s Github ..."

+  

+  [[ ${src} == 'ML' ]] && [[ -z ${desc} ]] && desc="Cloning Repo from ${hubname}'s Gitlab..."

   [[ ${src} == 'W' ]] && echo ${pkg} | grep -q "\.torrent$" || echo ${pkg} | grep -q "^magnet:\?.*" && 

     viewName="Downloading Torrent File..." && desc=""