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

Added Debian bullseye support for the installer #1202

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Added Debian bullseye support for the installer #1202

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
775ccc9
Merge pull request #1 from opensim-org/master
marnunez May 25, 2020
40471aa
Added Debian bullseye support
marnunez May 25, 2020
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
101 changes: 53 additions & 48 deletions Gui/opensim/installer_files/Linux/INSTALL
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,25 @@
function err_unsupported_env {
printf "\r [\033[0;31mERROR:\033[0m] Your distro/release is not supported by this script\n"
printf " Ubuntu 18.04 LTS is currently the only Linux distribution that is tested \
against, however the OpenSim GUI will likely run on other distributions and/or \
releases. See the https://github.com/opensim-org/opensim-gui for more \
information.\n"
exit 1
}

function usage {
echo -n "INSTALL [OPTIONS]...

Install the OpenSim GUI. Ubuntu 18.04 LTS is the only tested Linux. Manual \
installation on other systems may be possible; see \
https://github.com/opensim-org/opensim-gui for more information.

Options:
-p, --prefix Install prefix; defaults to /opt/opensim-gui
-v, --verbose Be verbose
-h, --help Display this help and exit
"
}
against, however the OpenSim GUI will likely run on other distributions and/or \
releases. See the https://github.com/opensim-org/opensim-gui for more \
information.\n"
exit 1
}

function usage {
echo -n "INSTALL [OPTIONS]...

Install the OpenSim GUI. Ubuntu 18.04 LTS is the only tested Linux. Manual \
installation on other systems may be possible; see \
https://github.com/opensim-org/opensim-gui for more information.

Options:
-p, --prefix Install prefix; defaults to /opt/opensim-gui
-v, --verbose Be verbose
-h, --help Display this help and exit
"
}

# From https://stackoverflow.com/a/246128
SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
Expand Down Expand Up @@ -83,26 +83,31 @@ done
## End from https://stackoverflow.com/a/29754866

if [[ -e /etc/os-release ]]; then
. /etc/os-release
OS=$NAME
VER=$VERSION_ID
. /etc/os-release
OS=$ID
OS_NAME=$NAME
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This variable appears to be unused now and can be removed?

if ! [ -z "${VERSION_ID+x}" ]; then
VER=$VERSION_ID
fi
Comment on lines +89 to +91
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My bash skills aren't the greatest (and I wasn't able to figure it out with some quick googling); can you explain what the +x is doing? Also, if you're negating the -z option, wouldn't using -n or even just [ "$VERSION_ID+x}" ] be more concise/readable?

if ! [ -z "${PRETTY_NAME+x}" ]; then
OS_FULL=$PRETTY_NAME
fi
else
err_unsupported_env
fi

if [[ $OS == "Ubuntu" ]] && [[ $VER == "18.04" ]]; then
fi
if ([[ $OS == "ubuntu" ]] && [[ $VER == "18.04" ]]) || ([[ $OS == "debian" ]] && [[ $OS_FULL =~ "bullseye" ]]); then
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason (ie in terms of an expectation of a non-exact match) for using the =~ comparison for matching "bullseye"? I'm not familiar with Debian


[[ $v == 1 ]] && echo "Installing Java..."
sudo apt install -qqqq -y openjdk-8-jre

[[ $v == 1 ]] && echo "Testing for system LAPACK/BLAS..."
if ! (ldconfig -p | grep -q "libblas|liblapack"); then
if ! (sudo ldconfig -p | grep -q "libblas|liblapack"); then
[[ $v == 1 ]] && echo " Installing liblapack3..."
sudo apt install -qqqq -y liblapack3
fi

[[ $v == 1 ]] && echo "Testing for libgconf..."
if ! (ldconfig -p | grep -q "libgconf"); then
if ! (sudo ldconfig -p | grep -q "libgconf"); then
[[ $v == 1 ]] && echo " Installing libgconf..."
sudo apt install -qqqq -y libgconf-2-4
fi
Expand All @@ -114,27 +119,27 @@ if [[ $OS == "Ubuntu" ]] && [[ $VER == "18.04" ]]; then

[[ $v == 1 ]] && echo "Adding OpenSim to list of desktop applications..."
echo "[Desktop Entry]
Version=1.0
Type=Application
Name=OpenSim
Comment=OpenSim is an open source software for neuromusculoskeletal modeling, simulation \
and analysis.
Path=$installPrefix
Exec=$installPrefix/bin/OpenSim
Icon=opensim
Terminal=false
Categories=Science;Education" | sudo tee /usr/share/applications/opensim.desktop > /dev/null
sudo cp OpenSimLogoWhiteNoText.png /usr/share/pixmaps/opensim.png

[[ $v == 1 ]] && echo "Installing opensim-core commands..."
cd $installPrefix/bin
if [[ $v == 1 ]]; then
./opensim-install-command-line.sh
else
./opensim-install-command-line.sh > /dev/null
fi
else
err_unsupported_env
Version=1.0
Type=Application
Name=OpenSim
Comment=OpenSim is an open source software for neuromusculoskeletal modeling, simulation \
and analysis.
Comment on lines +125 to +126
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
Comment=OpenSim is an open source software for neuromusculoskeletal modeling, simulation \
and analysis.
Comment=Neuromusculoskeletal modeling, simulation, and analysis.

We had changed this in the standalone desktop file but I noticed that I had forgot to make that change here as well.

Path=$installPrefix
Exec=$installPrefix/bin/OpenSim
Icon=opensim
Terminal=false
Categories=Science;Education" | sudo tee /usr/share/applications/opensim.desktop > /dev/null
sudo cp OpenSimLogoWhiteNoText.png /usr/share/pixmaps/opensim.png

[[ $v == 1 ]] && echo "Installing opensim-core commands..."
cd $installPrefix/bin
if [[ $v == 1 ]]; then
./opensim-install-command-line.sh
else
./opensim-install-command-line.sh > /dev/null
fi
else
err_unsupported_env
fi