boxtec
/
yacy_search_server
mirror of https://github.com/yacy/yacy_search_server
4
1
Fork 0
Code Issues Projects Releases Wiki Activity

fixes for dependency on svn

Browse Source
pull/1/head
Michael Christen 13 years ago
parent 404758698a
commit c715d19c09
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File

2
defaults/yacy.init
Unescape View File

@ -125,7 +125,7 @@ update.cycle = 168
# It is recommended to set this list to low developer version numbers # It is recommended to set this list to low developer version numbers
update.blacklist = ...[123] update.blacklist = ...[123]
# a update can also restricted with a concept property, which can decide if an # a update can also restricted with a concept property, which can decide if an
# update is only valid if it either is a main release or any svn release including new development releases # update is only valid if it either is a main release or any release including new development releases
# Valid keywords are 'main' and 'any' # Valid keywords are 'main' and 'any'
update.concept = any update.concept = any
# the following values are set automatically: # the following values are set automatically:

4
htroot/ConfigUpdate_p.java
Unescape View File

@ -127,7 +127,7 @@ public class ConfigUpdate_p {
sb.getLog().logInfo("AUTO-UPDATE: downloading more recent release " + updateVersion.getUrl()); sb.getLog().logInfo("AUTO-UPDATE: downloading more recent release " + updateVersion.getUrl());
final File downloaded = updateVersion.downloadRelease(); final File downloaded = updateVersion.downloadRelease();
prop.putHTML("candeploy_autoUpdate_downloadedRelease", updateVersion.getName()); prop.putHTML("candeploy_autoUpdate_downloadedRelease", updateVersion.getName());
final boolean devenvironment = new File(sb.getAppPath(), ".svn").exists(); final boolean devenvironment = new File(sb.getAppPath(), ".git").exists();
if (devenvironment) { if (devenvironment) {
sb.getLog().logInfo("AUTO-UPDATE: omitting update because this is a development environment"); sb.getLog().logInfo("AUTO-UPDATE: omitting update because this is a development environment");
prop.put("candeploy_autoUpdate", "3"); prop.put("candeploy_autoUpdate", "3");
@ -156,7 +156,7 @@ public class ConfigUpdate_p {
// version information // version information
final String versionstring = yacyBuildProperties.getVersion() + "/" + yacyBuildProperties.getSVNRevision(); final String versionstring = yacyBuildProperties.getVersion() + "/" + yacyBuildProperties.getSVNRevision();
prop.putHTML("candeploy_versionpp", versionstring); prop.putHTML("candeploy_versionpp", versionstring);
final boolean devenvironment = new File(sb.getAppPath(), ".svn").exists(); final boolean devenvironment = new File(sb.getAppPath(), ".git").exists();
float thisVersion = Float.parseFloat(yacyBuildProperties.getVersion()); float thisVersion = Float.parseFloat(yacyBuildProperties.getVersion());
// cut off the SVN Rev in the Version // cut off the SVN Rev in the Version
try { try {

2
htroot/Steering.java
Unescape View File

@ -73,7 +73,7 @@ public class Steering {
if (post.containsKey("update")) { if (post.containsKey("update")) {
Log.logInfo("STEERING", "update request from " + requestIP); Log.logInfo("STEERING", "update request from " + requestIP);
final boolean devenvironment = new File(sb.getAppPath(), ".svn").exists(); final boolean devenvironment = new File(sb.getAppPath(), ".git").exists();
final String releaseFileName = post.get("releaseinstall", ""); final String releaseFileName = post.get("releaseinstall", "");
final File releaseFile = new File(sb.getDataPath(), "DATA/RELEASE/".replace("/", File.separator) + releaseFileName); final File releaseFile = new File(sb.getDataPath(), "DATA/RELEASE/".replace("/", File.separator) + releaseFileName);
if ((!devenvironment) && (releaseFileName.length() > 0) && (releaseFile.exists())) { if ((!devenvironment) && (releaseFileName.length() > 0) && (releaseFile.exists())) {

2
source/net/yacy/search/Switchboard.java
Unescape View File

@ -1788,7 +1788,7 @@ public final class Switchboard extends serverSwitch {
// there is a version that is more recent. Load it and re-start with it // there is a version that is more recent. Load it and re-start with it
this.log.logInfo("AUTO-UPDATE: downloading more recent release " + updateVersion.getUrl()); this.log.logInfo("AUTO-UPDATE: downloading more recent release " + updateVersion.getUrl());
final File downloaded = updateVersion.downloadRelease(); final File downloaded = updateVersion.downloadRelease();
final boolean devenvironment = new File(this.getAppPath(), ".svn").exists(); final boolean devenvironment = new File(this.getAppPath(), ".git").exists();
if (devenvironment) { if (devenvironment) {
this.log.logInfo("AUTO-UPDATE: omitting update because this is a development environment"); this.log.logInfo("AUTO-UPDATE: omitting update because this is a development environment");
} else if ((downloaded == null) || (!downloaded.exists()) || (downloaded.length() == 0)) { } else if ((downloaded == null) || (!downloaded.exists()) || (downloaded.length() == 0)) {

5
yacy-svn-4.spec
Unescape View File

@ -9,8 +9,8 @@ Version: @REPL_VERSION@_@REPL_REVISION_NR@
Release: 3 Release: 3
License: GPL License: GPL
Group: Application/Internet Group: Application/Internet
Source0: svn://svn.berlios.de/yacy/trunk Source0: git@gitorious.org:yacy/rc1.git
URL: http://www.yacy.net/yacy/ URL: http://yacy.net
Requires: bash Requires: bash
Requires: sudo Requires: sudo
Requires: coreutils Requires: coreutils
@ -90,6 +90,7 @@ cp AUTHORS COPYRIGHT ChangeLog gpl.txt readme.txt ${RPM_BUILD_ROOT}$YACYDDIR/
install -m 744 *.sh ${RPM_BUILD_ROOT}$YACYCDIR/ # start/stop/kill scripts install -m 744 *.sh ${RPM_BUILD_ROOT}$YACYCDIR/ # start/stop/kill scripts
rm -r `find ${RPM_BUILD_ROOT}/ -type d -name '.svn'` # delete unwanted .svn-folders rm -r `find ${RPM_BUILD_ROOT}/ -type d -name '.svn'` # delete unwanted .svn-folders
rm -r `find ${RPM_BUILD_ROOT}/ -type d -name '.git'` # delete unwanted .git-folders
# location for init-script # location for init-script
install -d ${RPM_BUILD_ROOT}/etc/init.d/ install -d ${RPM_BUILD_ROOT}/etc/init.d/

Write Preview
Loading…
Cancel
Save