Mejoradas variables y .

2 files changed, 39 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3b763180a98f..93f9f566d38b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,15 @@
-pkgbase = pseint-bin
+pkgbase = pseint
 	pkgdesc = A tool for learning programming basis with a simple spanish pseudocode
 	pkgver = 20230517
 	pkgrel = 1
 	url = http://pseint.sourceforge.net
 	arch = x86_64
 	license = GPL2
-	depends = gendesk
+	makedepends = gendesk
 	depends = wxwidgets-gtk3
 	conflicts = pseint
 	noextract = creator.psz
 	source = pseint-20230517.tgz::https://cfhcable.dl.sourceforge.net/project/pseint/20230517/pseint-l64-20230517.tgz
 	sha256sums = 1208bbf2247f0b5f89c0b6f85ee0ab9816a89c102a6d4ab7a041109b1425cb4d
 
-pkgname = pseint-bin
+pkgname = pseint
diff --git a/PKGBUILD b/PKGBUILD
index efbebfb90479..c9d22e89dbd2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,58 +1,71 @@
 # Maintainer: dakataca <🐬danieldakataca@gmail.com>
 # Contributor: Cristophero <cristophero.alvarado@gmail.com>
-pkgname=pseint-bin
-_pkgname=${pkgname%-*}
+
+_pkgname=pseint-bin
+pkgname=${_pkgname%-*}
 pkgver=20230517
 pkgrel=1
 pkgdesc="A tool for learning programming basis with a simple spanish pseudocode"
 arch=('x86_64')
 url='http://pseint.sourceforge.net'
 license=('GPL2')
-conflicts=('pseint')
-depends=('gendesk' 'wxwidgets-gtk3')
+conflicts=("$pkgname")
+makedepends=('gendesk')
+depends=('wxwidgets-gtk3')
 noextract=(creator.psz)
-source=("${_pkgname}-${pkgver}.tgz::https://cfhcable.dl.sourceforge.net/project/${_pkgname}/${pkgver}/${_pkgname}-l64-${pkgver}.tgz")
+source=("$pkgname-$pkgver.tgz::https://cfhcable.dl.sourceforge.net/project/$pkgname/$pkgver/$pkgname-l64-$pkgver.tgz")
 sha256sums=('1208bbf2247f0b5f89c0b6f85ee0ab9816a89c102a6d4ab7a041109b1425cb4d')  # 'makepkg -g' to generate it.
 
+
 # Función 'prepare': Prepara el entorno antes de compilar el paquete.
 prepare(){
-    cd ${_pkgname}
+    cd $pkgname
+
     # Utilidad 'gendesk' para generar el archivo .desktop.
     gendesk -f -n \
-        --pkgname="${_pkgname}" \
-        --pkgdesc="${pkgdesc}" \
-        --name="${_pkgname}" \
-        --genericname="${_pkgname}" \
-        --comment="${pkgdesc}" \
-        --exec="${_pkgname}" \
-        --path="/opt/${_pkgname}" \
-        --icon="${_pkgname}" \
+        --pkgname="$pkgname" \
+        --pkgdesc="$pkgdesc" \
+        --name="$pkgname" \
+        --genericname="$pkgname" \
+        --comment="$pkgdesc" \
+        --exec="$pkgname" \
+        --path="/opt/$pkgname" \
+        --icon="$pkgname" \
         --categories='Development,Education'
 }
 
+
 # Función 'pkgver': Devuelve la versión del paquete.
 pkgver(){
-    cd ${_pkgname}
+    cd $pkgname
     cat version
 }
 
+
 # Función 'package': Empaqueta los archivos compilados en el paquete final.
 package(){
-    cd ${_pkgname}
+    cd $pkgname
+
     # Crear ruta de destino transitoria.
-    mkdir -p ${pkgdir}/opt/${_pkgname}
+    mkdir -p $pkgdir/opt/$pkgname
+
     # Copiar el contenido compilado a la ruta de destino transitoria.
-    cp -rv . ${pkgdir}/opt/${_pkgname}
+    cp -rv . $pkgdir/opt/$pkgname
+
     # Instala el archivo .desktop en la ubicación (-t) adecuada.
-    install -Dvm644 "${_pkgname}.desktop" -t "${pkgdir}/usr/share/applications"
+    install -Dvm644 "$pkgname.desktop" -t "$pkgdir/usr/share/applications"
+
     # Instala el archivo de licencia en la ubicación adecuada.
-    install -Dvm644 "imgs/icon.icns" "${pkgdir}/usr/share/pixmaps/${_pkgname}.icns"
-    # Crea un archivo ejecutable en la ubicación /usr/bin/${pkgname} que ejecuta el programa wxPSeInt(pseint).
-    install -Dvm755 <(echo -e '#!/usr/bin/env bash\n/opt/pseint/wxPSeInt') ${pkgdir}/usr/bin/${_pkgname}
+    install -Dvm644 "imgs/icon.icns" "$pkgdir/usr/share/pixmaps/$pkgname.icns"
+
+    # Crea un archivo ejecutable en la ubicación /usr/bin/$pkgname que ejecuta el programa wxPSeInt(pseint).
+    install -Dvm755 <(echo -e '#!/usr/bin/env bash\n/opt/pseint/wxPSeInt') $pkgdir/usr/bin/$pkgname
 }
 
+
 ## Test:
-#  rm -rf pseint-* src/ pkg/
+# rm -rf pseint-* src/ pkg/
+# makepkg --printsrcinfo > .SRCINFO
 
 ## References
 # https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=densify