Skip to content

Commit 5a4e661

Browse files
committed
refactoring
1 parent ee13c48 commit 5a4e661

2 files changed

Lines changed: 16 additions & 13 deletions

File tree

usr/libexec/helper-scripts/curl-prgrs

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -55,19 +55,8 @@ set -o errtrace
5555
## provides: draw_progress_bar
5656
source /usr/libexec/helper-scripts/progress-bar
5757

58-
## success: whole numbers such as 1 2 3 456 etc.
59-
## fail:
60-
## 5.5
61-
## 5,500
62-
## trailing spaces
63-
## leading spaces
64-
## empty input
65-
## space only
66-
## scientific notation such as 1.23e10
67-
## negative numbers such as -1
68-
is_whole_number() {
69-
[[ "$1" =~ ^[0-9]+$ ]]
70-
}
58+
## provides: is_whole_number
59+
source /usr/libexec/helper-scripts/strings.bsh
7160

7261
initialize_terminal() {
7362
# We want to print the progress bar to stderr, but only if stderr is a

usr/libexec/helper-scripts/strings.bsh

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,20 @@ trim_collapse_split() {
5656
echo "$formatted_list"
5757
}
5858

59+
## success: whole numbers such as 1 2 3 456 etc.
60+
## fail:
61+
## 5.5
62+
## 5,500
63+
## trailing spaces
64+
## leading spaces
65+
## empty input
66+
## space only
67+
## scientific notation such as 1.23e10
68+
## negative numbers such as -1
69+
is_whole_number() {
70+
[[ "$1" =~ ^[0-9]+$ ]]
71+
}
72+
5973
run_test() {
6074
local test_name varname value expected_exit_code
6175
test_name="$1"

0 commit comments

Comments
 (0)