Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix globus-domainname; add prerequisites to ubuntu 18.04 #114

Merged
merged 4 commits into from
Dec 16, 2019
Merged

Fix globus-domainname; add prerequisites to ubuntu 18.04 #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e2c9ee6
Verify if GLOBUS_HOSTNAME is an IP address. Fixes globus-domainname g…
Dec 16, 2019
bdf593e
Add a line indicating the required packages for ubuntu 18.04.
Dec 16, 2019
774a9cc
Update common/source/scripts/globus-hostname.in
RubenGarcia Dec 16, 2019
2525244
As requested, for pure IP addresses, domain name should be empty.
Dec 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions INSTALL.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ Minimal tools needed (for CentOS7)

The minimal RPMs (as provided by CentOS7 yum) needed to build this package are:
autoconf automake make libtool libtool-ltdl libtool-ltdl-devel gcc gcc-c++ patch openssl openssl-devel
The minimal DEBs (as provided by Ubuntu 18.04) are
autoconf automake make libtool libltdl-dev gcc g++ patch openssl libssl-dev pkg-config

If not already installed, please also add
curl
Expand Down
7 changes: 5 additions & 2 deletions common/source/scripts/globus-hostname.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,11 @@ if [ -z "${GLOBUS_HOSTNAME}" ] ; then
GLOBUS_HOSTNAME="`echo ${_fullname} | tr 'A-Z' 'a-z'`"
fi

GLOBUS_DOMAINNAME="`echo $GLOBUS_HOSTNAME | cut -s -d '.' -f '2-'`"
if $(echo "$GLOBUS_HOSTNAME" | grep -Eq '^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$'); then
GLOBUS_DOMAINNAME=""
else
GLOBUS_DOMAINNAME="`echo $GLOBUS_HOSTNAME | cut -s -d '.' -f '2-'`"
fi

case "${PROGRAM_NAME}" in

Expand All @@ -152,4 +156,3 @@ esac