Use uname to determine operating system with -o switch.

This commit is contained in:
Marco Vermeulen
2013-01-14 22:48:54 +00:00
parent 5c38db2a08
commit 04f2d06e92
3 changed files with 4 additions and 3 deletions

View File

@@ -17,7 +17,7 @@
#
export GVM_VERSION="@GVM_VERSION@"
export GVM_PLATFORM=$(uname)
export GVM_PLATFORM=$(uname -o)
if [ -z "${GVM_SERVICE}" ]; then
export GVM_SERVICE="@GVM_SERVICE@"

View File

@@ -18,7 +18,6 @@
# Global variables
GVM_SERVICE="@GVM_SERVICE@"
GVM_VERSION="@GVM_VERSION@"
GVM_PLATFORM=$(uname)
GVM_DIR="$HOME/.gvm"
# Local variables
@@ -34,6 +33,8 @@ gvm_bash_profile="${HOME}/.bash_profile"
gvm_profile="${HOME}/.profile"
gvm_bashrc="${HOME}/.bashrc"
gvm_zshrc="${HOME}/.zshrc"
gvm_platform=$(uname -o)
gvm_init_snippet=$( cat << EOF
#THIS MUST BE AT THE END OF THE FILE FOR GVM TO WORK!!!
[[ -s "${GVM_DIR}/bin/gvm-init.sh" && ! \$(which gvm-init.sh) ]] && source "${GVM_DIR}/bin/gvm-init.sh"

View File

@@ -23,7 +23,7 @@ if [ -z "${GVM_DIR}" ]; then
GVM_DIR="$HOME/.gvm"
fi
gvm_platform=$(uname)
gvm_platform=$(uname -o)
gvm_bin_folder="${GVM_DIR}/bin"
gvm_tmp_zip="${GVM_DIR}/tmp/res-${GVM_VERSION}.zip"
gvm_stage_folder="${GVM_DIR}/tmp/stage"