epm repack: fixes for ktalk (ALT bug 43486)

bin/epm-repack

@@ -192,6 +192,7 @@ EOF
     to_remove_pkg_files="$to_remove_pkg_files $HOME/.rpmmacros"
 }
 
+
 __set_version_pkgname()
 {
     local alpkg="$1"
@@ -199,6 +200,17 @@ __set_version_pkgname()
     [ -n "$VERSION" ] && PKGNAME="$(echo "$alpkg" | sed -e "s|[-_.]$VERSION.*||")"
 }
 
+
+# AppImage version
+# hack for ktalk2.4.2 -> ktalk 2.4.2
+__set_version_apppkgname()
+{
+    local alpkg="$1"
+    VERSION="$(echo "$alpkg" | grep -o -P "[-_.a-zA-Z]([0-9])([0-9])*(\.[0-9])*" | head -n1 | sed -e 's|^[-_.a-zA-Z]||')" #"
+    [ -n "$VERSION" ] && PKGNAME="$(echo "$alpkg" | sed -e "s|$VERSION.*||")"
+}
+
+
 # arg: <package file>
 # sets:
 #   alpkg      - package file name without path
@@ -226,7 +238,7 @@ __prepare_source_package()
     fi
 
     if rhas "$alpkg" "\.AppImage$" ; then
-        __set_version_pkgname $alpkg
+        __set_version_apppkgname $alpkg
         [ -n "$VERSION" ] || fatal "Can't get version from $alpkg."
         SUBGENERIC='appimage'
         # TODO: move repack archive to erc?

play.d/ktalk.sh

 #!/bin/sh
 
-PKGNAME=ktalk2
+PKGNAME=ktalk
 SUPPORTEDARCHES="x86_64"
 DESCRIPTION="Контур.Толк (ktalk) from the official site"
 

repack.d/generic-appimage.sh

@@ -34,8 +34,8 @@ remove_dir $(find $BUILDROOT -type d -name "*catalina*" | sed -e "s|$BUILDROOT||
 cd - >/dev/null
 
 add_bin_exec_command $PRODUCT $PRODUCTDIR/AppRun
-# Strange AppRun script uses args as path, so override apth detection
-subst "1iexport APPDIR=$PRODUCTDIR" $BUILDROOT/usr/bin/$PRODUCT
+# Strange AppRun script uses args as path, so override path detection
+subst "2iexport APPDIR=$PRODUCTDIR" $BUILDROOT/usr/bin/$PRODUCT
 
 subst '1iAutoProv:no' $SPEC
 subst '1iAutoReq:yes,nopython,nomono,nomonolib' $SPEC