Commit f2b24502 authored by Vitaly Lipatov's avatar Vitaly Lipatov

distr_info: resort functions

parent e053ec73
...@@ -591,9 +591,6 @@ fi ...@@ -591,9 +591,6 @@ fi
} }
fill_distr_info
[ -n "$DISTRIB_ID" ] || DISTRIB_ID="Generic"
get_uname() get_uname()
{ {
tolower "$(uname $1)" | tr -d " \t\r\n" tolower "$(uname $1)" | tr -d " \t\r\n"
...@@ -896,15 +893,8 @@ Distro name / version (--distro-name/version): $DISTRO_NAME / $DISTRIB_FULL_RELE ...@@ -896,15 +893,8 @@ Distro name / version (--distro-name/version): $DISTRO_NAME / $DISTRIB_FULL_RELE
EOF EOF
} }
case "$2" in print_help()
-*) {
echo "Unsupported option $2" >&2
exit 1
;;
esac
case "$1" in
-h|--help)
echo "distro_info v$PROGVERSION - distro information retriever" echo "distro_info v$PROGVERSION - distro information retriever"
echo "Usage: distro_info [options] [SystemName/Version]" echo "Usage: distro_info [options] [SystemName/Version]"
echo "Options:" echo "Options:"
...@@ -934,6 +924,22 @@ case "$1" in ...@@ -934,6 +924,22 @@ case "$1" in
echo " --build-id - print a string uniquely identifying the system image originally used as the installation base" echo " --build-id - print a string uniquely identifying the system image originally used as the installation base"
echo " -V - print the utility version" echo " -V - print the utility version"
echo "Run without args to print all information." echo "Run without args to print all information."
}
fill_distr_info
[ -n "$DISTRIB_ID" ] || DISTRIB_ID="Generic"
case "$2" in
-*)
echo "Unsupported option $2" >&2
exit 1
;;
esac
case "$1" in
-h|--help)
print_help
exit 0 exit 0
;; ;;
-p|--package-type) -p|--package-type)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment