From f44a1874a8dd46e706121c5cdb8aa8973f8be91c Mon Sep 17 00:00:00 2001 From: gnosygnu Date: Tue, 22 Jan 2019 03:32:09 -0500 Subject: [PATCH] Dev: Replace wget with curl; fix JAVA_HOME [#335] --- xowa_get_and_make.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/xowa_get_and_make.sh b/xowa_get_and_make.sh index 8c6c87e57..1ee3311d4 100644 --- a/xowa_get_and_make.sh +++ b/xowa_get_and_make.sh @@ -4,11 +4,10 @@ # ** Apache Ant 1.9.13 (or higher): https://ant.apache.org/bindownload.cgi # ** A ROOT_DIR directory on your file-system # ** (Windows) cygwin: https://www.cygwin.com/ -# ** (Mac OS X) wget via homebrew (or just download the file manually): https://stackoverflow.com/questions/33886917/how-to-install-wget-in-macos # # * PROCESS # ** Copy-paste this file to a plain-text file; EX: /cygdrive/c/xowa_dev/xowa_get_and_make.sh -# ** Adjust these environment variables to your system: PLAT_NAME, ROOT_DIR, ANT_BINARY, JAVA_JDK_DIR +# ** Adjust these environment variables to your system: PLAT_NAME, ROOT_DIR, ANT_BINARY, JAVA_HOME # ** cd to your ROOT_DIR # ** Run the file using "sh xowa_get_and_make.sh" # ** Run the xowa_dev.jar @@ -24,11 +23,11 @@ PLAT_NAME=windows_64 ROOT_DIR=c:/xowa_dev # these directories MUST be changed to wherever they exist on your system ANT_BINARY=/cygdrive/c/dev/apache_ant/bin/ant -JAVA_JDK_DIR=/cygdrive/c/dev/java/jdk_1_7_x64 +JAVA_HOME=/cygdrive/c/dev/java/jdk_1_7_x64 # == DOWNLOAD XOWA SOURCE == # get src and unzip -wget https://api.github.com/repos/gnosygnu/xowa/tarball/master +curl -LO https://api.github.com/repos/gnosygnu/xowa/tarball/master mkdir src # unzip; note that "strip 1" removes container folder EX: gnosygnu-123456 tar -zxf master -C ./src --strip 1