epm repack: small cleanup

bin/epm-repack

@@ -154,7 +154,7 @@ EOF
 # args: pkgname buildroot spec
 __apply_fix_code()
 {
-    local repackcode="$CONFIGDIR/repack.d/$1.sh"
+    local repackcode="$(realpath $CONFIGDIR/repack.d/$1.sh)"
     [ -x "$repackcode" ] || return
     shift
     export PATH=$PROGDIR:$PATH

repack.d/common-chromium-browser.sh

@@ -48,7 +48,7 @@ remove_file()
     local file="$1"
     [ -f $BUILDROOT/$file ] || return
 
-    rm -f $BUILDROOT/$file
+    rm -fv $BUILDROOT/$file
     subst "s|.*$file.*||" $SPEC
 }
 
@@ -62,6 +62,7 @@ cleanup()
 
     # remove unsupported file
     remove_file /usr/share/menu/$PRODUCT.menu
+    remove_file /usr/share/menu/$PRODUCTCUR.menu
 }
 
 

repack.d/yandex-browser-beta.sh

@@ -8,9 +8,10 @@ PRODUCT=yandex-browser
 PRODUCTCUR=yandex-browser-beta
 PRODUCTDIR=/opt/yandex/browser-beta
 
+. $(dirname $0)/common-chromium-browser.sh
+
 subst '1iConflicts:yandex-browser-stable' $SPEC
 
-. $(dirname $0)/common-chromium-browser.sh
 
 set_alt_alternatives 65
 
@@ -24,7 +25,3 @@ use_system_xdg
 
 install_deps
 
-
-#if ! grep -q '^"/usr/bin/yandex-browser"' $SPEC ; then
-#    subst 's|\(.*/usr/bin/yandex-browser.*\)|"/usr/bin/yandex-browser"\n\1|' $SPEC
-#fi

repack.d/yandex-browser-stable.sh

@@ -8,10 +8,10 @@ PRODUCT=yandex-browser
 PRODUCTCUR=yandex-browser-stable
 PRODUCTDIR=/opt/yandex/browser
 
-subst '1iConflicts:yandex-browser-beta' $SPEC
-
 . $(dirname $0)/common-chromium-browser.sh
 
+subst '1iConflicts:yandex-browser-beta' $SPEC
+
 set_alt_alternatives 65
 
 copy_icons_to_share
@@ -24,7 +24,3 @@ use_system_xdg
 
 install_deps
 
-
-#if ! grep -q '^"/usr/bin/yandex-browser"' $SPEC ; then
-#    subst 's|\(.*/usr/bin/yandex-browser.*\)|"/usr/bin/yandex-browser"\n\1|' $SPEC
-#fi