Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master z-rejected grimoire by David Kowis (671dabc1c9b3fe4a6804e9108d33b90e3490a9d7)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: David Kowis <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master z-rejected grimoire by David Kowis (671dabc1c9b3fe4a6804e9108d33b90e3490a9d7)
  • Date: Thu, 28 Dec 2006 14:06:53 -0600

GIT changes to master z-rejected grimoire by David Kowis
<dkowis@melchiah.(none)>:

ChangeLog | 4 ++++
z-java/JAVA_WARNING | 16 ++++++++++++++++
2 files changed, 20 insertions(+)

New commits:
commit 671dabc1c9b3fe4a6804e9108d33b90e3490a9d7
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis@melchiah.(none)>

JAVA_WARNING
Modified the java warning to verify existence of necessary files.
If the files are already there, then they've already been downloaded, and
it is safe to assume that the downloader agreed to the license, since
they must.
We still don't automatically download, only stop if they haven't
downloaded.

diff --git a/ChangeLog b/ChangeLog
index 24fd038..925e3a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-12-28 David Kowis <dkowis AT shlrm.org>
+ * z-java/JAVA_WARNING: made it bypass the java warning if the files
have
+ already been downloaded. Reduces irritation significantly.
+
2006-12-17 Juuso Alasuutari <iuso AT sourcemage.org>
* FUNCTIONS: Replaced old get_kernel_version,
get_sorcery_kernel_config, and get_running_kernel_config with
diff --git a/z-java/JAVA_WARNING b/z-java/JAVA_WARNING
index 0579d8f..827a566 100755
--- a/z-java/JAVA_WARNING
+++ b/z-java/JAVA_WARNING
@@ -6,8 +6,24 @@ message "\n${MESSAGE_COLOR}" \
"for the files and location. Put the downloaded files in
/var/spool/sorcery \n" \
"so cast will find it.${DEFAULT_COLOR}\n"

+local JAVA_SOURCE_NUMBER
+local JAVA_SVAR
+local JAVA_ALL_SOURCES="y"
+for JAVA_SOURCE_NUMBER in $(get_source_nums X); do
+ JAVA_SOURCE_NUMBER=${JAVA_SOURCE_NUMBER/X/}
+ JAVA_SVAR="SOURCE${JAVA_SOURCE_NUMBER}"
+ message "${MESSAGE_COLOR}Verifying
${SOURCE_CACHE}/${!JAVA_SVAR}${DEFAULT_COLOR}"
+ if [ ! -e $SOURCE_CACHE/${!JAVA_SVAR} ]; then
+ JAVA_ALL_SOURCES="n"
+ fi
+done
+
+if [[ "$JAVA_ALL_SOURCES" != "y" ]]; then
if ! query "YOU HAVE DOWNLOADED THE SOURCES AND WISH TO CONTINUE CASTING?" n;
then
message "${MESSAGE_COLOR}Please recast when you have the sources!\n"
return 1
fi
+else
+ message "${MESSAGE_COLOR}All sources already downloaded!.
Continuing.${DEFAULT_COLOR}"
+fi



  • [SM-Commit] GIT changes to master z-rejected grimoire by David Kowis (671dabc1c9b3fe4a6804e9108d33b90e3490a9d7), David Kowis, 12/28/2006

Archive powered by MHonArc 2.6.24.

Top of Page