2.5.7-alt0.M80C.1

Makefile

@@ -9,7 +9,9 @@ install:
 	cp -a `ls -1 bin/* | grep -v "[-_]"` $(DESTDIR)$(bindir)/
 	cp -a bin/distr_info $(DESTDIR)$(bindir)/
 	chmod 0755 $(DESTDIR)$(bindir)/*
-	sed -e "s|SHAREDIR=.*|SHAREDIR=$(instpkgdatadir)|g" -e "s|@VERSION@|$(version)|g" <bin/epm >$(DESTDIR)$(bindir)/epm
+	sed -e "s|SHAREDIR=.*|SHAREDIR=$(instpkgdatadir)|g" \
+		-e "s|CONFIGDIR=.*|CONFIGDIR=$(sysconfdir)/eepm|g" \
+		-e "s|@VERSION@|$(version)|g" <bin/epm >$(DESTDIR)$(bindir)/epm
 	sed -e "s|SHAREDIR=.*|SHAREDIR=$(instpkgdatadir)|g" -e "s|@VERSION@|$(version)|g" <bin/serv >$(DESTDIR)$(bindir)/serv
 
 	mkdir -p $(DESTDIR)$(pkgdatadir)/

bin/epm

@@ -27,6 +27,7 @@ fi
 
 # will replaced to /usr/share/eepm during install
 SHAREDIR=$PROGDIR
+CONFIGDIR=$PROGDIR/..
 
 load_helper()
 {

bin/epm-addrepo

@@ -105,7 +105,7 @@ case $PMTYPE in
 		if echo "$repo" | grep -q "https://" ; then
 			assure_exists apt-transport-https
 		fi
-		apt-add-repository "$repo"
+		sudocmd apt-add-repository "$repo"
 		info "Check file /etc/apt/sources.list if needed"
 		;;
 	aptitude-dpkg)

bin/epm-downgrade

@@ -71,20 +71,22 @@ epm_downgrade()
 
 	case $PMTYPE in
 	apt-rpm)
+		local APTOPTIONS="$(subst_option non_interactive -y)"
 		__epm_add_alt_apt_downgrade_preferences || return
 		if [ -n "$pkg_filenames" ] ; then
-			sudocmd apt-get install $pkg_filenames
+			sudocmd apt-get $APTOPTIONS install $pkg_filenames
 		else
-			sudocmd apt-get dist-upgrade
+			sudocmd apt-get $APTOPTIONS dist-upgrade
 		fi
 		__epm_remove_apt_downgrade_preferences
 		;;
 	apt-dpkg)
+		local APTOPTIONS="$(subst_option non_interactive -y)"
 		__epm_add_deb_apt_downgrade_preferences || return
 		if [ -n "$pkg_filenames" ] ; then
-			sudocmd apt-get install $pkg_filenames
+			sudocmd apt-get  $APTOPTIONS install $pkg_filenames
 		else
-			sudocmd apt-get dist-upgrade
+			sudocmd apt-get $APTOPTIONS dist-upgrade
 		fi
 		__epm_remove_apt_downgrade_preferences
 		;;

bin/epm-removerepo

@@ -65,7 +65,7 @@ esac;
 case $PMTYPE in
 	apt-dpkg)
 		assure_exists apt-add-repository software-properties-common
-		apt-add-repository --remove "$repo"
+		sudocmd apt-add-repository --remove "$repo"
 		info "Check file /etc/apt/sources.list if needed"
 		;;
 	aptitude-dpkg)

bin/epm-repack

@@ -136,7 +136,7 @@ __fix_spec()
 
 __apply_fix_code()
 {
-    local repackcode="/etc/eepm/repack.d/$1.sh"
+    local repackcode="$CONFIGDIR/repack.d/$1.sh"
     [ -x "$repackcode" ] || return
     shift
     docmd $repackcode "$1" "$2" || warning "There was errors with $repackcode script"

eepm.spec

 # This spec is backported to ALTLinux p8 automatically by rpmbph script from etersoft-build-utils.
 #
 Name: eepm
-Version: 2.5.6
+Version: 2.5.7
 Release: alt0.M80C.1
 
 Summary: Etersoft EPM package manager
@@ -42,7 +42,7 @@ See detailed description here: http://wiki.etersoft.ru/EPM
 %install
 # install to datadir and so on
 # do not use uncommon makeinstall_std here
-%make_install install DESTDIR=%buildroot datadir=%_datadir bindir=%_bindir mandir=%_mandir version=%version-%release
+%make_install install DESTDIR=%buildroot datadir=%_datadir bindir=%_bindir mandir=%_mandir sysconfdir=%_sysconfdir version=%version-%release
 #install -m 0755 packed/epm.sh %buildroot/%_datadir/%name/epm-packed.sh
 #install -m 0755 packed/serv.sh %buildroot/%_datadir/%name/serv-packed.sh
 
@@ -90,6 +90,15 @@ rm -f %buildroot%_datadir/%name/tools_eget
 %_sysconfdir/bash_completion.d/cerv
 
 %changelog
+* Wed Feb 27 2019 Andrey Cherepanov <cas@altlinux.org> 2.5.7-alt0.M80C.1
+- backport new version to c8 branch
+
+* Mon Feb 25 2019 Vitaly Lipatov <lav@altlinux.ru> 2.5.7-alt1
+- epm downgrade: add --auto support
+- add CONFIGDIR support
+- add repack scripts for chromium-gost and google-chrome
+- fix comments
+
 * Sat Feb 23 2019 Andrey Cherepanov <cas@altlinux.org> 2.5.6-alt0.M80C.1
 - backport new version to c8 branch
 

repack.d/chromium-gost-stable.sh

+#!/bin/sh -x
+# It will run with two args: buildroot spec
+BUILDROOT="$1"
+SPEC="$2"
+
+subst 's|%dir "/opt/chromium-gost"|%dir "/opt/chromium-gost"\n/usr/share/icons/hicolor/*x*/apps/*.png|' $SPEC
+
+# Make relative symlink
+rm -f $BUILDROOT/usr/bin/chromium-gost-stable
+ln -s ../../opt/chromium-gost/chromium-gost $BUILDROOT/usr/bin/chromium-gost-stable
+ln -s chromium-gost-stable $BUILDROOT/usr/bin/chromium-gost
+
+for i in 16 22 24 32 48 64 128 256 ; do
+    mkdir -p $BUILDROOT/usr/share/icons/hicolor/${i}x${i}/apps/
+    cp $BUILDROOT/opt/chromium-gost/product_logo_$i.png $BUILDROOT/usr/share/icons/hicolor/${i}x${i}/apps/chromium-gost.png
+done
+
+rm -f $BUILDROOT/etc/cron.daily/chromium-gost
+subst 's|.*/etc/cron.daily/chromium-gost.*||' $SPEC
+
+subst 's|exec -a "$0" "$HERE/chrome" "$@"||' $BUILDROOT/opt/chromium-gost/chromium-gost
+cat <<EOF >>$BUILDROOT/opt/chromium-gost/chromium-gost
+if ! [[ "\$*" =~ \-user\-data\-dir= ]]; then
+       exec -a "\$0" "\$HERE/chrome" "-user-data-dir=\$HOME/.config/chromium-gost" "\$@"
+else
+       exec -a "\$0" "\$HERE/chrome" "\$@"
+fi
+EOF

repack.d/duplicati.sh

 #!/bin/sh -x
 
-# It will run with two args: buildroot spec
+# It will be run with two args: buildroot spec
 BUILDROOT="$1"
 SPEC="$2"
 

repack.d/example.sh

 #!/bin/sh
-# Place shell code here
-# It will run with two args: buildroot spec
-# Name this script like package name
+# Place your shell code here
+# It will be run with two args: buildroot spec
+# Name this script as package name
+
 BUILDROOT="$1"
 SPEC="$2"
 

repack.d/google-chrome-stable.sh

+#!/bin/sh -x
+# It will run with two args: buildroot spec
+BUILDROOT="$1"
+SPEC="$2"
+
+subst 's|%dir "/opt/google/chrome"|%dir "/opt/google/chrome"\n/usr/share/icons/hicolor/*x*/apps/*.png|' $SPEC
+
+# Make relative symlink
+rm -f $BUILDROOT/usr/bin/google-chrome-stable
+ln -s ../../opt/google/chrome/google-chrome $BUILDROOT/usr/bin/google-chrome-stable
+ln -s google-chrome-stable $BUILDROOT/usr/bin/google-chrome
+
+for i in 16 22 24 32 48 64 128 256 ; do
+    mkdir -p $BUILDROOT/usr/share/icons/hicolor/${i}x${i}/apps/
+    cp $BUILDROOT/opt/google/chrome/product_logo_$i.png $BUILDROOT/usr/share/icons/hicolor/${i}x${i}/apps/google-chrome.png
+done
+
+rm -f $BUILDROOT/etc/cron.daily/google-chrome
+subst 's|.*/etc/cron.daily/google-chrome.*||' $SPEC
+
+# google-chrome by default?
+#subst 's|exec -a "$0" "$HERE/chrome" "$@"||' $BUILDROOT/opt/google/chrome/google-chrome
+#cat <<EOF >>$BUILDROOT/opt/google/chrome/google-chrome
+#if ! [[ "\$*" =~ \-user\-data\-dir= ]]; then
+#       exec -a "\$0" "\$HERE/chrome" "-user-data-dir=\$HOME/.config/google-chrome" "\$@"
+#else
+#       exec -a "\$0" "\$HERE/chrome" "\$@"
+#fi
+#EOF

repack.d/mssql-server.sh

 #!/bin/sh -x
 
-# It will run with two args: buildroot spec
+# It will be run with two args: buildroot spec
 BUILDROOT="$1"
 SPEC="$2"
 

repack.d/skypeforlinux.sh

 #!/bin/sh -x
 
-# It will run with two args: buildroot spec
+# It will be run with two args: buildroot spec
 BUILDROOT="$1"
 SPEC="$2"
 

repack.d/teamviewer.sh

 #!/bin/sh -x
 
-# It will run with two args: buildroot spec
+# It will be run with two args: buildroot spec
 BUILDROOT="$1"
 SPEC="$2"
 

repack.d/yandex-browser-beta.sh

 #!/bin/sh -x
 
-# It will run with two args: buildroot spec
+# It will be run with two args: buildroot spec
 BUILDROOT="$1"
 SPEC="$2"