Simplified after review and fixed order

hitachienergy · Oct 7, 2019 · 585cb1e · 585cb1e
1 parent d0117e1
commit 585cb1e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 25 deletions.
diff --git a/...a/common/ansible/playbooks/roles/repository/files/client/RedHat/disable-epirepo-client.sh b/...a/common/ansible/playbooks/roles/repository/files/client/RedHat/disable-epirepo-client.sh
@@ -1,5 +1,5 @@
 #!/bin/bash -eu
 
 yum-config-manager --disable epirepo
-yum clean all --enablerepo=epirepo --disablerepo='*'
+yum clean all --disablerepo='*' --enablerepo=epirepo
 yum repolist
diff --git a/.../playbooks/roles/repository/files/download-requirements/centos-7/download-requirements.sh b/.../playbooks/roles/repository/files/download-requirements/centos-7/download-requirements.sh
@@ -60,17 +60,6 @@ create_directory() {
 	fi
 }
 
-# params: <seconds>
-display_seconds() {
-	local seconds=$1
-	local h=$((seconds/3600))
-	local m=$((seconds%3600/60))
-	local s=$((seconds%60))
-	(( h > 0 )) && printf '%dh ' $h
-	(( m > 0 )) && printf '%dm ' $m
-	               printf '%ds' $s
-}
-
 # params: <file_url> <dest_dir>
 download_file() {
 	local file_url="$1"
@@ -590,4 +579,4 @@ remove_installed_packages "$INSTALLED_PACKAGES_FILE_PATH"
 
 readonly END_TIME=$(date +%s)
 
-echol "$(basename $0) finished, execution time: $(display_seconds $((END_TIME-START_TIME)))"
+echol "$(basename $0) finished, execution time: $(date -u -d @$((END_TIME-START_TIME)) +'%T')"
diff --git a/.../playbooks/roles/repository/files/download-requirements/redhat-7/download-requirements.sh b/.../playbooks/roles/repository/files/download-requirements/redhat-7/download-requirements.sh
@@ -60,17 +60,6 @@ create_directory() {
 	fi
 }
 
-# params: <seconds>
-display_seconds() {
-	local seconds=$1
-	local h=$((seconds/3600))
-	local m=$((seconds%3600/60))
-	local s=$((seconds%60))
-	(( h > 0 )) && printf '%dh ' $h
-	(( m > 0 )) && printf '%dm ' $m
-	               printf '%ds' $s
-}
-
 # params: <file_url> <dest_dir>
 download_file() {
 	local file_url="$1"
@@ -613,4 +602,4 @@ remove_installed_packages "$INSTALLED_PACKAGES_FILE_PATH"
 
 readonly END_TIME=$(date +%s)
 
-echol "$(basename $0) finished, execution time: $(display_seconds $((END_TIME-START_TIME)))"
+echol "$(basename $0) finished, execution time: $(date -u -d @$((END_TIME-START_TIME)) +'%T')"