Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed GPG key creation on VMware ESX Server, closes #11. Fixed clone …

…of the 'sun-java6' repository for users behind restrictive firewalls.
  • Loading branch information...
commit c640bffbca0a795f6350bbb9bd961d4daec4213c 1 parent b1c25af
@flexiondotorg authored
Showing with 63 additions and 47 deletions.
  1. +26 −18 CHANGES
  2. +27 −19 README
  3. +10 −10 oab-java6.sh
View
44 CHANGES
@@ -2,6 +2,14 @@
History
=======
+0.1.7
+-----
+
+ * Fixed GPG key creation on VMware ESX Server
+ - Closes : https://github.com/flexiondotorg/oab-java6/issues/11
+ * Fixed clone of the 'sun-java6' repository for users behind restrictive
+ firewalls, thanks to Thorsten Möllers.
+
0.1.6
-----
@@ -35,33 +43,33 @@ History
0.1.3
-----
-* Added checking out of tagged releases of the upstream scripts
- - Closes : https://github.com/flexiondotorg/oab-java6/issues/1
-* Added loose distribution checking so it should now work with Linux Mint and
- other Ubuntu derivatives
- - Closes : https://github.com/flexiondotorg/oab-java6/issues/2
-* Added the creation of a local 'apt' repository
-* Removed installation of Java packages, you can now use 'apt-get' yourself
-* Updated documentation
+ * Added checking out of tagged releases of the upstream scripts
+ - Closes : https://github.com/flexiondotorg/oab-java6/issues/1
+ * Added loose distribution checking so it should now work with Linux Mint and
+ other Ubuntu derivatives
+ - Closes : https://github.com/flexiondotorg/oab-java6/issues/2
+ * Added the creation of a local 'apt' repository
+ * Removed installation of Java packages, you can now use 'apt-get' yourself
+ * Updated documentation
0.1.2
-----
-* Fixed build requirements
-* Fixed install of 'ia32-sun-java6-bin' on 64-bit systems
-* Fixed install of Java browser plugin on systems without a supported browser
-* Added runtime requirements
-* Added TODO
-* Updated documentation
+ * Fixed build requirements
+ * Fixed install of 'ia32-sun-java6-bin' on 64-bit systems
+ * Fixed install of Java browser plugin on systems without a supported browser
+ * Added runtime requirements
+ * Added TODO
+ * Updated documentation
0.1.1
-----
-* Updated to use dynamic version detection throughout
-* Fixed package installation when upgrading
-* Minor documentation updates
+ * Updated to use dynamic version detection throughout
+ * Fixed package installation when upgrading
+ * Minor documentation updates
0.1.0
-----
-* Initial release
+ * Initial release
View
46 README
@@ -1,4 +1,4 @@
-oab-java6.sh v0.1.6 - Create a local 'apt' repository for Ubuntu Java packages.
+oab-java6.sh v0.1.7 - Create a local 'apt' repository for Ubuntu Java packages.
Copyright (c) 2012 Flexion.Org, http://flexion.org. MIT License
By running this script to download Java you acknowledge that you have
@@ -86,6 +86,14 @@ Because, O.A.B! ;-)
History
=======
+0.1.7
+-----
+
+ * Fixed GPG key creation on VMware ESX Server
+ - Closes : https://github.com/flexiondotorg/oab-java6/issues/11
+ * Fixed clone of the 'sun-java6' repository for users behind restrictive
+ firewalls, thanks to Thorsten Möllers.
+
0.1.6
-----
@@ -119,36 +127,36 @@ History
0.1.3
-----
-* Added checking out of tagged releases of the upstream scripts
- - Closes : https://github.com/flexiondotorg/oab-java6/issues/1
-* Added loose distribution checking so it should now work with Linux Mint and
- other Ubuntu derivatives
- - Closes : https://github.com/flexiondotorg/oab-java6/issues/2
-* Added the creation of a local 'apt' repository
-* Removed installation of Java packages, you can now use 'apt-get' yourself
-* Updated documentation
+ * Added checking out of tagged releases of the upstream scripts
+ - Closes : https://github.com/flexiondotorg/oab-java6/issues/1
+ * Added loose distribution checking so it should now work with Linux Mint and
+ other Ubuntu derivatives
+ - Closes : https://github.com/flexiondotorg/oab-java6/issues/2
+ * Added the creation of a local 'apt' repository
+ * Removed installation of Java packages, you can now use 'apt-get' yourself
+ * Updated documentation
0.1.2
-----
-* Fixed build requirements
-* Fixed install of 'ia32-sun-java6-bin' on 64-bit systems
-* Fixed install of Java browser plugin on systems without a supported browser
-* Added runtime requirements
-* Added TODO
-* Updated documentation
+ * Fixed build requirements
+ * Fixed install of 'ia32-sun-java6-bin' on 64-bit systems
+ * Fixed install of Java browser plugin on systems without a supported browser
+ * Added runtime requirements
+ * Added TODO
+ * Updated documentation
0.1.1
-----
-* Updated to use dynamic version detection throughout
-* Fixed package installation when upgrading
-* Minor documentation updates
+ * Updated to use dynamic version detection throughout
+ * Fixed package installation when upgrading
+ * Minor documentation updates
0.1.0
-----
-* Initial release
+ * Initial release
Todo
====
View
20 oab-java6.sh
@@ -32,7 +32,7 @@
# - http://irtfweb.ifa.hawaii.edu/~lockhart/gpg/gpg-cs.html
# Variables
-VER="0.1.6"
+VER="0.1.7"
function copyright_msg() {
local MODE=${1}
@@ -360,7 +360,7 @@ cecho success
# Skip anything todo with automated key creation if this script is running in
# an OpenVZ container.
-if [ `imvirt` != "OpenVZ" ]; then
+if [[ `imvirt` != "OpenVZ" ]]; then
# Do we need to create signing keys
if [ ! -e /var/local/oab/gpg/pubring.gpg ] && [ ! -e /var/local/oab/gpg/secring.gpg ] && [ ! -e /var/local/oab/gpg/trustdb.gpg ]; then
@@ -373,7 +373,7 @@ if [ `imvirt` != "OpenVZ" ]; then
echo "Name-Email: root@`hostname --fqdn`" >> /var/local/oab/gpg-key.conf
echo "Expire-Date: 0" >> /var/local/oab/gpg-key.conf
cecho success
-
+
# Stop the system 'rngd'.
/etc/init.d/rng-tools stop >> "$log" 2>&1
@@ -387,9 +387,9 @@ if [ `imvirt` != "OpenVZ" ]; then
ncecho " [x] Stop generating entropy "
kill -9 `cat /tmp/rngd.pid` >> "$log" 2>&1 &
- pid=$!;progress $pid
+ pid=$!;progress $pid
rm /tmp/rngd.pid 2>/dev/null
-
+
# Start the system 'rngd'.
/etc/init.d/rng-tools start >> "$log" 2>&1
fi
@@ -401,18 +401,18 @@ if [ -e /var/local/oab/gpg/pubring.gpg ] && [ -e /var/local/oab/gpg/secring.gpg
ncecho " [x] Signing the 'Release' file "
rm /var/local/oab/deb/Release.gpg 2>/dev/null
gpg --homedir /var/local/oab/gpg --armor --detach-sign --output /var/local/oab/deb/Release.gpg /var/local/oab/deb/Release >> "$log" 2>&1 &
- pid=$!;progress $pid
-
+ pid=$!;progress $pid
+
# Export public signing key
ncecho " [x] Exporting public key "
gpg --homedir /var/local/oab/gpg --export -a "`hostname --fqdn`" > /var/local/oab/deb/pubkey.asc
cecho success
-
+
# Add the public signing key
ncecho " [x] Adding public key "
apt-key add /var/local/oab/deb/pubkey.asc >> "$log" 2>&1 &
- pid=$!;progress $pid
-fi
+ pid=$!;progress $pid
+fi
# Update apt cache
echo "deb file:///var/local/oab/deb /" > /etc/apt/sources.list.d/oab.list
Please sign in to comment.
Something went wrong with that request. Please try again.