Исправлено обновление утилит с версии 3.4 на версию 3.5

8 years ago · 16b82ac7a1
parent 586da6b3b9
commit 16b82ac7a1
8 changed files with 15 additions and 15 deletions
--- a/profiles/templates/3.4/2_ac_install_merge/sys-apps/calculate-utils/50-patch-package
+++ b/profiles/templates/3.4/2_ac_install_merge/sys-apps/calculate-utils/50-patch-package
@ -9,8 +9,8 @@
 #
 #      http://www.apache.org/licenses/LICENSE-2.0

-CL_CORE_PATCH=/usr/sbin/cl-core-patch
-[[ -f $CL_CORE_PATCH ]] || CL_CORE_PATCH=/usr/bin/cl-core-patch
+CL_CORE_PATCH=/usr/bin/cl-core-patch
+[[ -f $CL_CORE_PATCH ]] || CL_CORE_PATCH=/usr/sbin/cl-core-patch

 if [[ ${EBUILD_PHASE} == "compile" ]] && [[ -d ${S} ]] && check_skip; then
 	if ! [[ -f /var/lib/calculate/calculate-core/cache/merge-patch.list ]] ||
--- a/profiles/templates/3.4/2_ac_install_merge/sys-apps/calculate-utils/50-post-setup-package
+++ b/profiles/templates/3.4/2_ac_install_merge/sys-apps/calculate-utils/50-post-setup-package
@ -9,8 +9,8 @@
 #
 #      http://www.apache.org/licenses/LICENSE-2.0

-CL_UPDATE_PROG=/usr/sbin/cl-core-setup
-[[ -f $CL_UPDATE_PROG ]] || CL_UPDATE_PROG=/usr/bin/cl-core-setup
+CL_UPDATE_PROG=/usr/bin/cl-core-setup
+[[ -f $CL_UPDATE_PROG ]] || CL_UPDATE_PROG=/usr/sbin/cl-core-setup

 post_setup_package() {
 	if [ -f ${CL_UPDATE_PROG} ] && [[ -f  /var/lib/calculate/-postmerge ]] && check_skip
--- a/profiles/templates/3.4/2_ac_install_merge/sys-apps/calculate-utils/50-setup-package
+++ b/profiles/templates/3.4/2_ac_install_merge/sys-apps/calculate-utils/50-setup-package
@ -9,8 +9,8 @@
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #
-CL_UPDATE_PROG=/usr/sbin/cl-core-setup
-[[ -f $CL_UPDATE_PROG ]] || CL_UPDATE_PROG=/usr/bin/cl-core-setup
+CL_UPDATE_PROG=/usr/bin/cl-core-setup
+[[ -f $CL_UPDATE_PROG ]] || CL_UPDATE_PROG=/usr/sbin/cl-core-setup
 [[ -d /var/lib/calculate ]] || mkdir /var/lib/calculate

 clear_systemd() {
--- a/profiles/templates/3.4/6_ac_update_sync/remerge/00-ini
+++ b/profiles/templates/3.4/6_ac_update_sync/remerge/00-ini
@ -2,4 +2,4 @@

 [overlay-calculate]
 # Save the latest version, because when switching profile cl-setup-profile 3.2.2 makes a call cl-setup-system
-remerge = 168
+remerge = 169
--- a/profiles/templates/3.4/6_ac_update_sync/remerge/101-200/169
+++ b/profiles/templates/3.4/6_ac_update_sync/remerge/101-200/169
@ -1,4 +1,4 @@
-# Calculate format=samba path=/etc/calculate name=ini.env merge=sys-apps/calculate-utils ini(overlay-calculate.remerge)<168
+# Calculate format=samba path=/etc/calculate name=ini.env merge=sys-apps/calculate-utils ini(overlay-calculate.remerge)<169

 [overlay-calculate]
-remerge = 168
+remerge = 169
--- a/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/50-patch-package
+++ b/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/50-patch-package
@ -9,8 +9,8 @@
 #
 #      http://www.apache.org/licenses/LICENSE-2.0

-CL_CORE_PATCH=/usr/sbin/cl-core-patch
-[[ -f $CL_CORE_PATCH ]] || CL_CORE_PATCH=/usr/bin/cl-core-patch
+CL_CORE_PATCH=/usr/bin/cl-core-patch
+[[ -f $CL_CORE_PATCH ]] || CL_CORE_PATCH=/usr/sbin/cl-core-patch

 if [[ ${EBUILD_PHASE} == "compile" ]] && [[ -d ${S} ]] && check_skip; then
 	if ! [[ -f /var/lib/calculate/calculate-core/cache/merge-patch.list ]] ||
--- a/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/50-post-setup-package
+++ b/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/50-post-setup-package
@ -9,8 +9,8 @@
 #
 #      http://www.apache.org/licenses/LICENSE-2.0

-CL_UPDATE_PROG=/usr/sbin/cl-core-setup
-[[ -f $CL_UPDATE_PROG ]] || CL_UPDATE_PROG=/usr/bin/cl-core-setup
+CL_UPDATE_PROG=/usr/bin/cl-core-setup
+[[ -f $CL_UPDATE_PROG ]] || CL_UPDATE_PROG=/usr/sbin/cl-core-setup

 post_setup_package() {
 	if [ -f ${CL_UPDATE_PROG} ] && [[ -f  /var/lib/calculate/-postmerge ]] && check_skip
--- a/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/50-setup-package
+++ b/profiles/templates/3.5/2_ac_install_merge/sys-apps/calculate-utils/50-setup-package
@ -9,8 +9,8 @@
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #
-CL_UPDATE_PROG=/usr/sbin/cl-core-setup
-[[ -f $CL_UPDATE_PROG ]] || CL_UPDATE_PROG=/usr/bin/cl-core-setup
+CL_UPDATE_PROG=/usr/bin/cl-core-setup
+[[ -f $CL_UPDATE_PROG ]] || CL_UPDATE_PROG=/usr/sbin/cl-core-setup
 [[ -d /var/lib/calculate ]] || mkdir /var/lib/calculate

 clear_systemd() {