small fixes

bin/epm-repack

@@ -94,8 +94,10 @@ __prepare_source_package()
 
     # TODO: use func for get name from deb pkg
     # TODO: epm print name from deb package
+    local pkgname="$(echo $alpkg | sed -e "s|_.*||")"
+
     # TODO: use stoplist only for deb?
-    [ -z "$force" ] && __check_stoplist $(echo $alpkg | sed -e "s|_.*||") && fatal "Please use official package instead of $alpkg repacking (It is not recommended to use --force to skip this checking."
+    [ -z "$force" ] && __check_stoplist $pkgname && fatal "Please use official package instead of $alpkg repacking (It is not recommended to use --force to skip this checking."
 
     SUBGENERIC=''
 

pack.d/kyodialog.sh

@@ -16,6 +16,7 @@ else
     fatal "Have no idea how to handle $(basename $TAR)"
 fi
 
+rm KyoceraLinuxPackages-*.tar.gz
 cd KyoceraLinuxPackages-* || fatal
 case "$(epm print info -p)" in
     rpm)

repack.d/generic.sh

@@ -96,9 +96,9 @@ if [ -r "$PKG.eepm.yaml" ] ; then
     set_rpm_field "Summary" "$summary"
     [ -n "$upstream_file" ] || upstream_file="binary package $PRODUCT"
     [ -n "$upstream_url" ] && upstream_file="$upstream_url"
-    [ -n "$description" ] && subst "s|^\((Converted from a\) \(.*\) \(package.*\)|$description\n(Repacked from $upstream_file with $(epm --short --version))\n\1 \2 \3|" $SPEC
+    [ -n "$description" ] && subst "s|^\((Converted from a\) \(.*\) \(package.*\)|$description\n(Repacked from $upstream_file with EPM $(epm --short --version))\n\1 \2 \3|" $SPEC
 else
-    subst "s|^\((Converted from a\) \(.*\) \(package.*\)|(Repacked from binary \2 package with $(epm --short --version))\n\1 \2 \3|" $SPEC
+    subst "s|^\((Converted from a\) \(.*\) \(package.*\)|(Repacked from binary \2 package with EPM $(epm --short --version))\n\1 \2 \3|" $SPEC
 fi
 
 # only for rpm

repack.d/obsidian.sh

@@ -12,9 +12,8 @@ PRODUCTDIR=/opt/Obsidian
 
 cleanup
 
-if [ ! -f "$BUILDROOT/usr/bin/$PRODUCT" ] ; then
-    add_bin_exec_command
-fi
+rm usr/bin/$PRODUCT
+add_bin_exec_command
 
 add_chromium_deps