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.

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

Download and install Zulu Embedded Java from .tar #459

Merged
merged 109 commits into from
Jan 10, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
109 commits
Select commit Hold shift + click to select a range
3f686e3
fix changing smbpasswd
mstormi Dec 19, 2017
bcd113b
Merge remote-tracking branch 'upstream/master'
mstormi Dec 19, 2017
3bdd4a8
Download and install Zulu Embedded from .tar
mstormi Nov 2, 2018
69c10c5
Download and install Zulu Embedded from .tar
mstormi Nov 2, 2018
89387d2
Create azul_zulu_license.md
mstormi Nov 2, 2018
2ed71d7
move setting Java options to openhab2_setup()
mstormi Nov 2, 2018
2be05b0
don't download to /tmp
mstormi Nov 13, 2018
bfd5c48
latest zulu is 8u192
mstormi Nov 13, 2018
44a52d2
java install into /opt/jdk
mstormi Nov 13, 2018
894f5ae
java link correction
mstormi Nov 13, 2018
bb8630a
java link corrected
mstormi Nov 13, 2018
6a70dad
Merge branch 'master' into patch-12
mstormi Dec 22, 2018
4497fb0
changes as requested by @thomdietrich
mstormi Dec 27, 2018
3161edb
reformat, add source link
mstormi Dec 27, 2018
d23d03f
rearranged java installation to catch errors
mstormi Dec 27, 2018
e01271a
fix: create TEMPROOT
mstormi Dec 27, 2018
497900a
Update java-jre.sh
Dec 27, 2018
8407baf
license -> docs
mstormi Dec 28, 2018
2808b3a
Create azul_zulu_license.md
mstormi Dec 29, 2018
41a96b6
Delete azul_zulu_license.md
mstormi Dec 29, 2018
d08cc81
license moved from docs to includes
mstormi Dec 29, 2018
f37ee50
Add newline before new entries in dashboard.cfg
Dec 20, 2017
f2c252e
Add homegear repositories for supported systems (#297)
lfrancke Jan 4, 2018
a462387
Fix Frontail setup function and service config #304
mhaack Jan 5, 2018
f310972
Add source front matter to USAGE file
Jan 7, 2018
c9547db
Add arping as basic package (#311)
mstormi Jan 13, 2018
e88d70d
Minor amanda README fix (#314)
mstormi Feb 4, 2018
6a9252b
Changed Nginx script to explicit use external DNS
EliasGabrielsson Feb 3, 2018
6e99e32
Start findserver after mosquitto (#328)
mstormi Feb 9, 2018
9fa79ef
Add PINE64 support for system binding and gpio, close #310 (#322)
EliasGabrielsson Feb 9, 2018
d537588
Change "Manual/Fresh Setup" menu to checklist (#331)
EliasGabrielsson Feb 14, 2018
d05cb9d
Improve password change function and cleanup #326 (#332)
EliasGabrielsson Mar 6, 2018
d481c79
Add openhab user to bluetooth group (required for Bluetooth binding) …
kaikreuzer Mar 6, 2018
97a6783
Mount vfat storage stick as user backup in example (#340)
mstormi Mar 6, 2018
035c63d
Fix function call typo (#344)
EliasGabrielsson Mar 6, 2018
b51ea30
Update README.md
Mar 8, 2018
27b61ea
Remove commandline openhab-generator, closes #329 (#335)
EliasGabrielsson Mar 17, 2018
cb38361
Fix unstable function call naming
BClark09 Mar 17, 2018
b226362
Restore ability to choose new conffile or not
BClark09 Mar 17, 2018
6c7cdd5
Improve fstab pattern-based share delete, fix #349
Mar 28, 2018
7fe34b3
Fix failing Amanada tape symlink creation (#354)
mues-lee Mar 29, 2018
fe31212
Remove deletion of rpi-update (#359)
Mar 30, 2018
4a8e498
Execute apt update after upgrade (#360)
mues-lee Mar 30, 2018
13004f9
Add console width check, close #345 (#361)
EliasGabrielsson Apr 1, 2018
5fe126a
Decrease width of warning, fix typos (#363)
Apr 1, 2018
279c428
Fix typo in samba password change function
BClark09 Apr 1, 2018
a825d93
updating grafana repository to use stretch builds (#365)
mues-lee Apr 8, 2018
cf7eb85
Add is_pithreeplus helper function, closes #374 (#376)
mues-lee Apr 10, 2018
bc7fb67
Update wifi function for stretch, resolves #374
Apr 10, 2018
4b47c08
Update Node.JS installer to use v8 (from v7) (#383)
brianwarner Apr 22, 2018
00d9d6f
Enables wifi by removing soft block (#380)
May 7, 2018
3de6632
Removes wpa_supplicant.conf on failed start so the user has a chance …
May 7, 2018
4b80944
Corrected misspelling (#394)
Confectrician May 14, 2018
e6e77dd
Add amanda settings backup, improve docs (#371)
mstormi May 15, 2018
fe398b6
Set Amanda SD card default size, increase net bandwidth (#370)
mstormi May 15, 2018
7d82d60
Retrieve gpg key unconditionally in openHAB setup
May 16, 2018
dad4fa8
Fixed syntax error in backup.sh (#397)
fmeies May 16, 2018
b25ea87
Add travis.yml
May 16, 2018
59a74a1
Update documentation links
wborn May 25, 2018
5c34072
Install distro specific versions of certbot (#403)
BClark09 May 27, 2018
e1a5d97
Reinstate and rerun upgrade during first-boot (#405)
Alluuu May 27, 2018
627ebb0
Generalise stable version in menu (#409)
BClark09 May 28, 2018
fbb5e80
Add a webserver to show log during RPi first-boot (#372)
mues-lee Jun 6, 2018
91afd93
Provide generic hostname in custom dashboard tiles. Closes #287, Fixe…
kubawolanin Jun 7, 2018
24e6ae9
Fixed broken Anchor (#417)
Confectrician Jun 10, 2018
de676a8
add optional component "Tellstick core service" (#390)
EliasGabrielsson Jun 10, 2018
0c3a641
merge buildchain and add custom repositories (#358)
EliasGabrielsson Jun 15, 2018
7bd3ad3
Set wifi country for wireless regulatory domain (#384)
Jun 17, 2018
c99252c
Update Node.JS installer to use Carbon for ARMv6l
brianwarner Apr 29, 2018
6d75927
Add Speedtest-cli as optional component (#421)
kubawolanin Jul 3, 2018
6eb4873
Support IPv4 link-local routes (169.254.x.x) (#434)
EliasGabrielsson Aug 25, 2018
02ccdc3
Added option to install openHAB milestone builds (#436)
mstormi Aug 30, 2018
7652283
minor wording changes and typos (#440)
mstormi Sep 20, 2018
4c81213
optimize Java memory allocation for low-mem SBCs (#443)
mstormi Sep 20, 2018
fe277a1
refactored Amanda AWS backup option (#449)
mstormi Oct 2, 2018
8945f60
Download and install Zulu Embedded from .tar
mstormi Nov 2, 2018
43c424a
Download and install Zulu Embedded from .tar
mstormi Nov 2, 2018
97145a8
Create azul_zulu_license.md
mstormi Nov 2, 2018
762d103
move setting Java options to openhab2_setup()
mstormi Nov 2, 2018
fb8f182
Set Java memory opts (moved from java-jre.sh) (#460)
mstormi Nov 12, 2018
c31e5d8
don't download to /tmp
mstormi Nov 13, 2018
c76ca87
latest zulu is 8u192
mstormi Nov 13, 2018
338b5d5
java install into /opt/jdk
mstormi Nov 13, 2018
802b668
java link correction
mstormi Nov 13, 2018
654beee
java link corrected
mstormi Nov 13, 2018
5a1f15c
maybe a bit too many warnings (#464)
mstormi Nov 14, 2018
a70824a
Updated list of optional openHABian components (#466)
mstormi Nov 20, 2018
e1c057f
Node-RED Install (#420)
msw1970 Nov 20, 2018
b7d0223
Fix sed expression to remove blank lines from /etc/fstab (#455)
rohanl Nov 20, 2018
a7bf0ca
Change from apt to apt-get in build (#472)
EliasGabrielsson Nov 28, 2018
2f55f2c
removed changerfile from amanda.conf (#474)
mstormi Dec 4, 2018
1751d11
Multitail update (#481)
Dec 17, 2018
262e6c2
Add fully scripted influxdb + grafana installation (#465)
EliasGabrielsson Dec 18, 2018
8623a9e
Fixed syntax error InfluxDB+Grafana installation (#486)
EliasGabrielsson Dec 18, 2018
8c100e0
Fixes bug in openhabian-config help menu (#438) (#483)
tylerbinski Dec 18, 2018
922c0a4
specify openhab2 package version (#476)
mstormi Dec 19, 2018
c3249d5
Remove unused Java installation code (#490)
EliasGabrielsson Dec 19, 2018
fb9d601
Zulu repo (#491)
EliasGabrielsson Dec 19, 2018
c6bc115
changes as requested by @thomdietrich
mstormi Dec 27, 2018
d6c6d18
reformat, add source link
mstormi Dec 27, 2018
8ae1647
rearranged java installation to catch errors
mstormi Dec 27, 2018
5df13f1
fix: create TEMPROOT
mstormi Dec 27, 2018
4ca4c43
Update java-jre.sh
Dec 27, 2018
494345e
license -> docs
mstormi Dec 28, 2018
e8deb02
Create azul_zulu_license.md
mstormi Dec 29, 2018
506256a
Delete azul_zulu_license.md
mstormi Dec 29, 2018
4388e0e
license moved from docs to includes
mstormi Dec 29, 2018
4e09e74
Merge branch 'patch-12' of https://github.com/mstormi/openhabian into…
mstormi Jan 3, 2019
28cbae4
remove Oracle java from options
mstormi Jan 3, 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
41 changes: 23 additions & 18 deletions functions/java-jre.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash

java_webupd8() {
java_webupd8_archive() {
echo -n "$(timestamp) [openHABian] Preparing and Installing Oracle Java 8 Web Upd8 repository... "
cond_redirect apt -y install dirmngr
cond_redirect apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys EEA14886
Expand All @@ -17,23 +17,28 @@ java_webupd8() {
if [ $? -eq 0 ]; then echo "OK"; else echo "FAILED"; exit 1; fi
}

java_zulu_embedded() {
echo -n "$(timestamp) [openHABian] Installing Zulu Embedded OpenJDK... "
cond_redirect apt -y install dirmngr
if is_arm; then arch="[arch=armhf]"; fi
cond_redirect apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 219BD9C9
if [ $? -ne 0 ]; then echo "FAILED (keyserver)"; exit 1; fi
if is_ubuntu; then
echo "deb $arch http://repos.azulsystems.com/ubuntu stable main" > /etc/apt/sources.list.d/zulu-embedded.list
else
echo "deb $arch http://repos.azulsystems.com/debian stable main" > /etc/apt/sources.list.d/zulu-embedded.list
fi
if is_pine64; then cond_redirect dpkg --add-architecture armhf; fi
cond_redirect apt update
java_zulu() {
local FILE="/var/tmp/.zulu.$$"
local INSTALLROOT=/opt/jdk
local TEMPROOT=/opt/jdk-new
mkdir ${INSTALLROOT}
mkdir ${TEMPROOT}

if is_arm; then
Copy link
Member

Choose a reason for hiding this comment

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

Please add a comment with the following URL above: https://www.azul.com/downloads/zulu-embedded

I'm not at all a fan of adding the version number as a fixed string. Could you please reach out their forum to find out if there is a static redircting link. You can also use the chance to ask about their Terms of Use.
This request should not block the merge of this PR.

cond_redirect apt -y install zulu-embedded-8
# Latest version check https://www.azul.com/downloads/zulu-embedded
local JAVA=zulu8.33.0.134-jdk1.8.0_192-linux_aarch32hf
else
cond_redirect apt -y install zulu-8
# Latest version check https://www.azul.com/downloads/zulu-linux
local JAVA=zulu8.33.0.1-jdk8.0.192-linux_x64
fi
if [ $? -eq 0 ]; then echo "OK"; else echo "FAILED"; exit 1; fi
}
whiptail --textbox $BASEDIR/includes/azul-zulu-license.md --scrolltext 27 116
Copy link
Member

Choose a reason for hiding this comment

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

"docs"? Please test your code before committing changes

Copy link
Contributor Author

@mstormi mstormi Dec 29, 2018

Choose a reason for hiding this comment

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

Yes it was working, pointing to docs which is where I had put the license.
I moved it to includes now, that's how I understood your comment.

Do you want me remove Oracle as part of this PR, too ?


cond_redirect wget -nv -O $FILE http://cdn.azul.com/zulu-embedded/bin/${JAVA}.tar.gz
cond_redirect tar -xpzf $FILE -C ${TEMPROOT}
if [ $? -ne 0 ]; then echo "FAILED (Zulu java)"; rm -f ${FILE}; exit 1; fi
rm -rf $FILE ${INSTALLROOT}/*
mv ${TEMPROOT}/* ${INSTALLROOT}/; rmdir ${TEMPROOT}
cond_redirect update-alternatives --install /usr/bin/java java ${INSTALLROOT}/${JAVA}/bin/java 1083000
cond_redirect update-alternatives --install /usr/bin/javac java ${INSTALLROOT}/${JAVA}/bin/javac 1083000
}

4 changes: 1 addition & 3 deletions functions/menu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,6 @@ show_main_menu() {
"61 | Upgrade System " "Upgrade all installed software packages to their newest version " OFF \
"62 | Packages" "Install needed and recommended system packages " OFF \
"63 | Zulu OpenJDK" "Install Zulu Embedded OpenJDK Java 8 " OFF \
" | Oracle Java 8" "(Alternative) Install Oracle Java 8 provided by WebUpd8Team " OFF \
"64 | openHAB stable" "Install the latest openHAB release" OFF \
" | openHAB testing" "Install the latest openHAB testing build" OFF \
" | openHAB unstable" "(Alternative) Install the latest openHAB SNAPSHOT build" OFF \
Expand All @@ -176,8 +175,7 @@ show_main_menu() {

if [[ $choosenComponents == *"61"* ]]; then system_upgrade; fi
if [[ $choosenComponents == *"62"* ]]; then basic_packages && needed_packages; fi
if [[ $choosenComponents == *"63"* ]]; then java_zulu_embedded; fi
if [[ $choosenComponents == *"Oracle Java 8"* ]]; then java_webupd8; fi
if [[ $choosenComponents == *"63"* ]]; then java_zulu; fi
if [[ $choosenComponents == *"64"* ]]; then openhab2_setup; fi
if [[ $choosenComponents == *"openHAB testing"* ]]; then openhab2_setup testing; fi
if [[ $choosenComponents == *"openHAB unstable"* ]]; then openhab2_setup unstable; fi
Expand Down
20 changes: 20 additions & 0 deletions includes/azul_zulu_license.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@


Zulu is copyrighted software based on OpenJDK (http://openjdk.java.net/) and is 100% open source.
By downloading, installing, or otherwise using Zulu, you hereby agree as follows:

Zulu is provided “AS IS” and without warranty of any kind, express or implied, including without limitation any
warranty of merchantability, fitness for a particular purpose, or noninfringement, each of which are hereby
expressly disclaimed. You acknowledge and agree that any use of Zulu is at your sole risk. Azul will not be liable
to you (whether under contract, tort, strict liability, negligence, or any other legal or equitable theory) for
(i) any indirect, incidental, consequential, special, punitive, or reliance damages relating to your download, use
or installation of Zulu (including without limitation any loss of or damage to data or systems), or
(ii) for any direct damages in excess of (in the aggregate) one hundred U.S. dollars ($100).
Some states do not allow the exclusion or limitation of incidental or consequential damages, so the above
limitations may not apply to you. Azul is not obligated to provide you with any support for Zulu (unless you have
entered into a separate written agreement for such support, in which case such separate agreement shall apply).
You also represent and warrant that you do not intend to distribute the software in a manner that is not compliant
with relevant export control laws or regulations administered by the U.S. Commerce Department, OFAC, or any other
government agency.

https://www.azul.com/products/zulu-and-zulu-enterprise/zulu-terms-of-use/