Skip to content

Commit c71cb86

Browse files
weizhouapacheweizhouapache
committed
Update #5851: Update as per Rohit's comments
1 parent c11e9b9 commit c71cb86

8 files changed

Lines changed: 23 additions & 6 deletions

File tree

‎debian/cloudstack-agent.postinst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ case "$1" in
5555

5656
# Print help message
5757
if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then
58+
acs_version=$(dpkg -l |grep cloudstack-agent |head -n1 |awk '{print $3}')
59+
sed -i "s,^ACS_VERSION=.*,ACS_VERSION=$acs_version,g" /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
5860
/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
5961
fi
6062

‎debian/cloudstack-management.postinst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@ if [ "$1" = configure ]; then
7474

7575
# Print help message
7676
if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then
77+
acs_version=$(dpkg -l |grep cloudstack-management |head -n1 |awk '{print $3}')
78+
sed -i "s,^ACS_VERSION=.*,ACS_VERSION=$acs_version,g" /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
7779
/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
7880
fi
7981
fi

‎debian/cloudstack-usage.postinst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ case "$1" in
4343

4444
# Print help message
4545
if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then
46+
acs_version=$(dpkg -l |grep cloudstack-usage |head -n1 |awk '{print $3}')
47+
sed -i "s,^ACS_VERSION=.*,ACS_VERSION=$acs_version,g" /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
4648
/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
4749
fi
4850
;;

‎packaging/centos7/cloud.spec‎

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

@@ -505,6 +506,7 @@ systemctl daemon-reload
505506
%posttrans agent
506507
# Print help message
507508
if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then
509+
sed -i "s,^ACS_VERSION=.*,ACS_VERSION=%{_maventag},g" /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
508510
/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
509511
fi
510512

@@ -539,6 +541,7 @@ fi
539541
%posttrans usage
540542
# Print help message
541543
if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then
544+
sed -i "s,^ACS_VERSION=.*,ACS_VERSION=%{_maventag},g" /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
542545
/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
543546
fi
544547

‎packaging/centos8/cloud.spec‎

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

@@ -496,6 +497,7 @@ systemctl daemon-reload
496497
%posttrans agent
497498
# Print help message
498499
if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then
500+
sed -i "s,^ACS_VERSION=.*,ACS_VERSION=%{_maventag},g" /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
499501
/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
500502
fi
501503

@@ -530,6 +532,7 @@ fi
530532
%posttrans usage
531533
# Print help message
532534
if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then
535+
sed -i "s,^ACS_VERSION=.*,ACS_VERSION=%{_maventag},g" /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
533536
/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
534537
fi
535538

‎packaging/suse15/cloud.spec‎

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

@@ -490,6 +491,7 @@ systemctl daemon-reload
490491
%posttrans agent
491492
# Print help message
492493
if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then
494+
sed -i "s,^ACS_VERSION=.*,ACS_VERSION=%{_maventag},g" /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
493495
/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
494496
fi
495497

@@ -524,6 +526,7 @@ fi
524526
%posttrans usage
525527
# Print help message
526528
if [ -f "/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text" ];then
529+
sed -i "s,^ACS_VERSION=.*,ACS_VERSION=%{_maventag},g" /usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
527530
/usr/share/cloudstack-common/scripts/installer/cloudstack-help-text
528531
fi
529532

‎scripts/installer/cloudstack-help-text‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,15 @@
1616
# specific language governing permissions and limitations
1717
# under the License.
1818

19+
ACS_VERSION=
20+
ACL_MINOR_VERSION=$(echo $ACS_VERSION | cut -d'-' -f1)
1921
printf "\n"
20-
printf "Thank you for installing Apache CloudStack !\n"
22+
printf "Thank you for installing Apache CloudStack ${ACS_VERSION:-} !\n"
2123
printf "\n"
22-
printf " * Project: https://cloudstack.apache.org/\n"
23-
printf " * Documentation: https://docs.cloudstack.apache.org/\n"
24+
printf " * Project website: https://cloudstack.apache.org/\n"
25+
printf " * Documentation: https://docs.cloudstack.apache.org/en/${ACL_MINOR_VERSION:-latest}/\n"
26+
printf " * Release notes: https://docs.cloudstack.apache.org/en/${ACL_MINOR_VERSION:-latest}/releasenotes/\n"
2427
printf " * Join us: https://cloudstack.apache.org/mailing-lists.html\n"
25-
printf " * Your feedback: https://cloudstack.apache.org/survey.html\n"
28+
printf " * Take the survey: https://cloudstack.apache.org/survey.html\n"
2629
printf " * Report issues: https://github.com/apache/cloudstack/issues\n"
27-
printf " * Latest releases: https://github.com/apache/cloudstack/releases\n"
2830
printf "\n"

‎ui/public/locales/en.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3015,7 +3015,7 @@
30153015
"message.host.dedication.released": "Host dedication released",
30163016
"message.info.cloudian.console": "Cloudian Management Console should open in another window",
30173017
"message.installwizard.click.retry": "Click the button to retry launch.",
3018-
"message.installwizard.cloudstack.helptext": "\nFind more information on pages below.\n * Project: https://cloudstack.apache.org/\n * Documentation: https://docs.cloudstack.apache.org/\n * Join us: https://cloudstack.apache.org/mailing-lists.html\n * Your feedback: https://cloudstack.apache.org/survey.html\n * Report issues: https://github.com/apache/cloudstack/issues\n * Latest releases: https://github.com/apache/cloudstack/releases\n",
3018+
"message.installwizard.cloudstack.helptext": "\nFind more information on pages below.\n * Project website: \t https://cloudstack.apache.org/\n * Documentation: \t https://docs.cloudstack.apache.org/\n * Release notes: \t https://docs.cloudstack.apache.org/en/latest/releasenotes/\n * Join us: \t\t https://cloudstack.apache.org/mailing-lists.html\n * Take the survey: \t https://cloudstack.apache.org/survey.html\n * Report issues: \t https://github.com/apache/cloudstack/issues\n",
30193019
"message.installwizard.copy.whatisacluster": "A cluster provides a way to group hosts. The hosts in a cluster all have identical hardware, run the same hypervisor, are on the same subnet, and access the same shared storage. Virtual machine instances (VMs) can be live-migrated from one host to another within the same cluster, without interrupting service to the user. A cluster is the third-largest organizational unit within a CloudStack™; deployment. Clusters are contained within pods, and pods are contained within zones.<br/><br/>CloudStack™; allows multiple clusters in a cloud deployment, but for a Basic Installation, we only need one cluster.",
30203020
"message.installwizard.copy.whatisahost": "A host is a single computer. Hosts provide the computing resources that run the guest virtual machines. Each host has hypervisor software installed on it to manage the guest VMs (except for bare metal hosts, which are a special case discussed in the Advanced Installation Guide). For example, a Linux KVM-enabled server, a Citrix XenServer server, and an ESXi server are hosts. In a Basic Installation, we use a single host running XenServer or KVM.<br/><br/>The host is the smallest organizational unit within a CloudStack™; deployment. Hosts are contained within clusters, clusters are contained within pods, and pods are contained within zones.",
30213021
"message.installwizard.copy.whatisapod": "A pod often represents a single rack. Hosts in the same pod are in the same subnet.<br/><br/>A pod is the second-largest organizational unit within a CloudStack™; deployment. Pods are contained within zones. Each zone can contain one or more pods; in the Basic Installation, you will have just one pod in your zone.",

0 commit comments

Comments
 (0)