Skip to content

Commit ea9a8d3

Browse files
committed
Support for ubuntu 18.04 added.
modified: README.md modified: scripts/show.info.sh modified: scripts/test.os.release.sh modified: scripts/upgrade.system.sh
1 parent 7f11043 commit ea9a8d3

4 files changed

Lines changed: 23 additions & 8 deletions

File tree

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Script collection to build libreoffice online or collabora online.
44

55
Supported Linux Distributions:
66
* Ubuntu 16.04.x, xenial
7+
* Ubuntu 18.04.x, bionic
78
* Debian 8.x, jessie
89
* Debian 9.x, stretch
910

scripts/show.info.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ show_info () {
2323

2424
echo "#######################################################################################"
2525
echo "# #"
26-
echo "# This script sets up an ubuntu 16.04., Debian 8.x, or Debian 9.x standard #"
27-
echo "# installation for building libreoffice online to use with nextcloud. #"
26+
echo "# This script sets up an ubuntu 16.04., ubuntu 18.04, Debian 8.x, or Debian 9.x #"
27+
echo "# standard installation for building libreoffice online to use with nextcloud. #"
2828
echo "# #"
2929
echo "# The first thing to do is updating the installation and installing the necessary #"
3030
echo "# tools and packages. #"

scripts/test.os.release.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ test_os_release () {
2424
case ${DIST_ID} in
2525
Ubuntu)
2626
case ${DIST_RELEASE} in
27-
16.04)
27+
16.04 | \
28+
18.04)
2829
SUPPORTED="1"
2930
;;
3031
*)
@@ -63,6 +64,7 @@ test_os_release () {
6364
echo "# At the moment the following systems are supported."
6465
echo "#"
6566
echo "# Ubuntu 16.04.* xenial"
67+
echo "# Ubuntu 18.04.* bionic"
6668
echo "# Debian 8.* jessie"
6769
echo "# Debian 9.* stretch"
6870
echo "#"

scripts/upgrade.system.sh

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,23 @@ upgrade_system () {
6868
;;
6969
esac
7070
;;
71-
*)
72-
sudo apt-get install npm -y
73-
sudo npm cache clean
74-
sudo npm install -g n
75-
sudo n stable
71+
Ubuntu)
72+
case ${DIST_RELEASE} in
73+
16.04)
74+
sudo apt-get install npm -y
75+
sudo npm cache clean
76+
sudo npm install -g n
77+
sudo n stable
78+
;;
79+
18.04)
80+
sudo apt-get install libzmf-dev libstaroffice-dev libglew-dev libserf-dev librdf0-dev -y
81+
sudo apt-get install openjdk-8-jdk -y
82+
sudo apt-get remove openjdk-11-jdk openjdk-11-jdk-headless openjdk-11-jre openjdk-11-jre-headless -y
83+
sudo apt-get install npm -y
84+
sudo npm install -g n
85+
sudo n stable
86+
;;
87+
esac
7688
;;
7789
esac
7890

0 commit comments

Comments
 (0)