Skip to content

Commit 5372aa1

Browse files
weizhouapacheweizhouapache
committed
Update #5851: display package name in help message
1 parent c71cb86 commit 5372aa1

7 files changed

Lines changed: 26 additions & 13 deletions

File tree

‎debian/cloudstack-agent.postinst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ case "$1" in
5757
if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then
5858
acs_version=$(dpkg -l |grep cloudstack-agent |head -n1 |awk '{print $3}')
5959
sed -i "s,^ACS_VERSION=.*,ACS_VERSION=$acs_version,g" /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
60-
/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
60+
/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text agent
6161
fi
6262

6363
;;

‎debian/cloudstack-management.postinst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ if [ "$1" = configure ]; then
7676
if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then
7777
acs_version=$(dpkg -l |grep cloudstack-management |head -n1 |awk '{print $3}')
7878
sed -i "s,^ACS_VERSION=.*,ACS_VERSION=$acs_version,g" /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
79-
/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
79+
/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text management
8080
fi
8181
fi
8282

‎debian/cloudstack-usage.postinst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ case "$1" in
4545
if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then
4646
acs_version=$(dpkg -l |grep cloudstack-usage |head -n1 |awk '{print $3}')
4747
sed -i "s,^ACS_VERSION=.*,ACS_VERSION=$acs_version,g" /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
48-
/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
48+
/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text usage
4949
fi
5050
;;
5151
esac

‎packaging/centos7/cloud.spec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ systemctl daemon-reload
462462
# Print help message
463463
if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then
464464
sed -i "s,^ACS_VERSION=.*,ACS_VERSION=%{_maventag},g" /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
465-
/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
465+
/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text management
466466
fi
467467

468468
%preun agent
@@ -507,7 +507,7 @@ systemctl daemon-reload
507507
# Print help message
508508
if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then
509509
sed -i "s,^ACS_VERSION=.*,ACS_VERSION=%{_maventag},g" /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
510-
/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
510+
/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text agent
511511
fi
512512

513513
%pre usage
@@ -542,7 +542,7 @@ fi
542542
# Print help message
543543
if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then
544544
sed -i "s,^ACS_VERSION=.*,ACS_VERSION=%{_maventag},g" /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
545-
/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
545+
/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text usage
546546
fi
547547

548548
%post marvin

‎packaging/centos8/cloud.spec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ systemctl daemon-reload
453453
# Print help message
454454
if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then
455455
sed -i "s,^ACS_VERSION=.*,ACS_VERSION=%{_maventag},g" /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
456-
/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
456+
/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text management
457457
fi
458458

459459
%preun agent
@@ -498,7 +498,7 @@ systemctl daemon-reload
498498
# Print help message
499499
if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then
500500
sed -i "s,^ACS_VERSION=.*,ACS_VERSION=%{_maventag},g" /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
501-
/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
501+
/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text agent
502502
fi
503503

504504
%pre usage
@@ -533,7 +533,7 @@ fi
533533
# Print help message
534534
if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then
535535
sed -i "s,^ACS_VERSION=.*,ACS_VERSION=%{_maventag},g" /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
536-
/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
536+
/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text usage
537537
fi
538538

539539
%post marvin

‎packaging/suse15/cloud.spec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ systemctl daemon-reload
447447
# Print help message
448448
if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then
449449
sed -i "s,^ACS_VERSION=.*,ACS_VERSION=%{_maventag},g" /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
450-
/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
450+
/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text management
451451
fi
452452

453453
%preun agent
@@ -492,7 +492,7 @@ systemctl daemon-reload
492492
# Print help message
493493
if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then
494494
sed -i "s,^ACS_VERSION=.*,ACS_VERSION=%{_maventag},g" /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
495-
/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
495+
/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text agent
496496
fi
497497

498498
%pre usage
@@ -527,7 +527,7 @@ fi
527527
# Print help message
528528
if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then
529529
sed -i "s,^ACS_VERSION=.*,ACS_VERSION=%{_maventag},g" /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
530-
/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
530+
/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text usage
531531
fi
532532

533533
%post marvin

‎scripts/installer/cloudstack-help-text‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,21 @@
1818

1919
ACS_VERSION=
2020
ACL_MINOR_VERSION=$(echo $ACS_VERSION | cut -d'-' -f1)
21+
22+
case $1 in
23+
management)
24+
PACKAGE="Managment Server"
25+
;;
26+
usage)
27+
PACKAGE="Usage Server"
28+
;;
29+
agent)
30+
PACKAGE="Agent"
31+
;;
32+
esac
33+
2134
printf "\n"
22-
printf "Thank you for installing Apache CloudStack ${ACS_VERSION:-} !\n"
35+
printf "Thank you for installing Apache CloudStack ${PACKAGE} ${ACS_VERSION} !\n"
2336
printf "\n"
2437
printf " * Project website: https://cloudstack.apache.org/\n"
2538
printf " * Documentation: https://docs.cloudstack.apache.org/en/${ACL_MINOR_VERSION:-latest}/\n"

0 commit comments

Comments
 (0)