From fafb57a5d5b33a03d248cb34e6745293650a7711 Mon Sep 17 00:00:00 2001 From: "psyc://psyced.org/~lynX" <@> Date: Tue, 3 Mar 2009 00:41:19 +0100 Subject: [PATCH] adios, references to cvs --- CHANGESTODO | 11 +- INSTALL.txt | 261 ---------------------- README.txt | 112 ---------- bin/psyconf | 50 +++-- config/gentoo/Makefile | 4 +- config/gentoo/ldmud.ebuild | 5 +- config/gentoo/ldmud/Makefile | 2 +- config/gentoo/ldmud/files/psyced.settings | 2 +- config/gentoo/psyced.ebuild | 4 +- config/gentoo/psyced/Makefile | 2 +- config/gentoo/psyclpc.ebuild | 5 +- config/psyced.settings | 2 +- config/{cvs.tcsh => versioncontrol.tcsh} | 4 +- install.sh | 64 +++--- world/status-0-beta-OK | 3 +- 15 files changed, 71 insertions(+), 460 deletions(-) delete mode 100644 INSTALL.txt delete mode 100644 README.txt rename config/{cvs.tcsh => versioncontrol.tcsh} (91%) diff --git a/CHANGESTODO b/CHANGESTODO index f09be18..cc28bae 100644 --- a/CHANGESTODO +++ b/CHANGESTODO @@ -824,7 +824,7 @@ ________________________________________________________________________ - elmex: disco geht auch nicht fiPP: dass wir auf iq teilweise mit message antworten ist nen uralter bug - end<< 2nd_testxmpp@beta.ve.example.com/x + send<< 2nd_testxmpp@beta.ve.example.com/x 10 @@ -846,15 +846,6 @@ ________________________________________________________________________ - recv>> 2nd_testxmpp@beta.ve.example.com/x - - - - - - - - - autojoin() is disabled, so jabber clients never get to enter newsfeed places. no news is bad news sometimes. maybe we should simply suppress all output of autojoins by maintaining diff --git a/INSTALL.txt b/INSTALL.txt deleted file mode 100644 index 29b44a6..0000000 --- a/INSTALL.txt +++ /dev/null @@ -1,261 +0,0 @@ -Installing the psyced - -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -We're very proud to see you are about to install a psyced! - -(Windows System) - You received this in form of an executable. By executing it you - will be prompted some questions, then sent to a web-based - configuration interface. So essentially you don't need any help here. - Please move directly on to the FIRSTSTEPS document once you have - done the installation. - [1]http://www.psyced.org/FIRSTSTEPS - -(Gentoo Linux System) - Download the ebuilds which are available from [2]http://www.psyced.org - and follow the instructions inside. Once psyced is emerged you can go - directly to chapter 3. - -(Linux or Unix System) - In a nutshell, all you have to do is execute './install.sh' and go from - there. It will tell you to download an LPC driver from - [3]http://lpc.psyc.eu - then compile and configure it with you interactively. So you don't need - to know anything more now, but if you want more information, read on. - -(Questions and Answers) - Don't be afraid to come into our developer chatroom and interact with - us as you go along. We have designed the installation to be totally - simple and beginner friendly. If you're not experiencing it as such, - something has gone wrong. Don't try to figure it out alone, talk to us. - And.. please be patient with our slow response times. - - psyc://psyced.org/@welcome - [4]irc://psyced.org/#welcome - [5]http://psyced.org/PSYC/ - [6]telnet psyced.org - - -0. System Requirements - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - - You can probably skip this if you think you have a sanely configured - GNU/POSIX system. - - The following requirements exist for building psyced and psyclpc: - - o Disk Space: - - Make sure you have approximately 7 MB of temporary free disk space - available. After installation psyced occupies approximately 3 MB of - disk space (the actual required disk space depends on the amount of - users, logs etc). - - o ANSI-C Compiler: - - Make sure you have an ANSI-C compiler installed. The GNU C compiler - (GCC) from the Free Software Foundation (FSF) is recommended. - You can find the homepage of GNU at [7]http://www.gnu.org/. GCC - binaries for Solaris can be loaded from [8]http://www.sunfreeware.com/. - - o POSIX YACC compliant grammar compiler - - You probably have either bison or yacc installed, otherwise do the - appropriate emerge or whatever software installation. - - o Useful C libraries - - OpenSSL, pcre, zlib, idn > 0.5.5, nsl, mlib. - - o Some standard or popular Unix applications - - bzip2, make, egrep, touch, uname, sh, sed, fileutils etc. - - o PERL 5 Interpreter - - The distribution includes some perl scripts that may or may not - be useful. 'psyconf' in particular is needed to get the configuration - in place, it is however not needed at runtime. - - -1. How to compile an LPC driver manually - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - - You can skip this part if you want to let the installation mechanism - do it for you. To be honest, the danger of us not giving you enough - information for you to get it done right is lessened if you let the - process do it. - - [9]http://lpc.psyc.eu will direct you to the current download areas for - the PSYC-enabled LPC driver, psyclpc. It uses - a standard auto-configuration system which on most platforms does all the - work for you (see below for exceptions). That's how install.sh can do it - just like that. - - To prepare the compilation, enter the src directory of the LPC driver and - execute './configure' (which will run the 'settings/psyced' script). - The default target directory is '/opt/psyced' or a subdirectory of your - home directory if you are installing in user mode. Please edit the - 'settings/psyced' script if you need a different path. You may want to - tweak some compilation configuration settings contained in that file, - but there isn't a need to. - - - After configuration is finished, you may want to modify the Makefile - to fine tune those parameters which are not covered by the configuration. - (like maybe change 'INSTALL=./install.sh -c' to 'INSTALL=./install.sh') - But there is generally no need to do anything. - - The compilation is done using make. Following targets are implemented: - - : compile the driver - install: compile the driver and install it in ${bindir} - utils: compile the utilities, especially the ERQ daemon - install-utils: compile and install the utilities in ${bindir} - - You will need an 'psyclpc' and an 'erq' binary for psyced to work. - For more details feel free to read the driver's INSTALL file. - - -2. Okay, let's install it! - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - - To install psyced, execute the './install.sh' script from within - the distribution directory. On some systems you may have to use a - different shell, like 'ksh install.sh' or 'bash install.sh'. - - You will be asked some configuration questions. When done, it will - create several files for you and transfer the content of the psyced - distribution to the target directory you specified interactively. - Depending on your userid (root or other) you will be given - /opt/psyced or ~/psyced as defaults for installation. We - continue this documentation assuming you picked the root defaults. - - Start psyced: - /opt/psyced/bin/psyced - - Test it: - telnet localhost 2323 - or - irc localhost - - -3. Configuring psyced - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - - Either install.sh has generated a psyced.ini for you, or your - software management tools have produced one for you. It usually - resides in /etc/psyc, but you may have chosen to put it elsewhere. - - Have a look into that file to ensure it has all the settings you - want. There are some further configuration options in there that - install.sh hasn't asked you about. - - Every time you change that file you need to feed it to the - psyconf command which will generate several control files for - your psyced installation. Editing those files by hand is not - recommended as a new call to 'psyconf' will simply delete any - manual changes. - - We also have a very neat web-based configuration tool. Unfortunately - it hasn't been updated to work with the new configuration strategy. - Still, 'psyconf' is enough for most things. - - -4. Troubleshooting - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - * Should you attempt to run psyced as root, you may later experience problems - running it under the uid you actually were planning to use, because files - have been generated that belong to root. 'chown -R ' repairs that. - - * Should erq refuse to compile, your system might be providing a less recent - resolver library. Add '-lresolv' manually to LIBS in the Makefile and - re-issue 'make' (theroue had this effect on Slackware). - - * We recently had a bug in the install.sh by which the line in the 'mypsyced' - file which is in charge of calling ./configure was broken in two and thus - only one half of the flags were used. Should you find #undef TLS in your - config.h it is quite likely that 'mypsyced' is literally broken in two. - - * The LPC driver will have TLS in, even if you told install.sh not to use it. - This allows you to change your mind later on and shouldn't be a problem, - but if it is, edit src/config.h to #undef USE_TLS and redo the compilation. - - * Recent variants of psyclpc and LDMUD complain when you compile TLS in, then - don't have a certificate to go with it. You can safely ignore it. This and - related messages are harmless and need no treatment: - 'SSL error:02001002:system library:fopen:No such file or directory.' - - * There are however recent problems with gnutls. psyclpc and LDMUD are being - used with openssl in most cases, so the gnutls interface may not be up to - date. If you encounter problems, try installing openssl. - - * Should it look for the lpc driver in /usr/sbin although you have it - elsewhere, then psyconf got the architecture guessing wrong. Come - into the chat and show us the first lines of psyconf output, so - we can fix that. - - * Sometimes installation problems can be fixed by running a cvs update - on install.sh and bin/psyconf, if they are new and just recently corrected. - If your install.sh doesn't appear updateable, look into the installation - directory - there is another copy. Run 'cvs update install.sh' then copy - it back to where you need it. - - * Should you see the message "Failed to load master object 'secure/master'!" - when starting the driver, then you compiled it without the psyced.settings - which the installation process should have used automatically. You can - find them in the config directory. - - * "tls_init_connection(): TLS layer hasn't been initialized." usually - happens when you are connecting a TLS port with no TLS on the client - side. But it can also mean that psyclpc didn't successfully read its - key and certificate from the start. Are the permissions correct? - What is psyclpc telling you right after starting up? Is it able to - read your key and certificate file? - - * If you make any costum modifications to the psyced source code, you may - run into CVS collisions when running the psyced -u command to - fetch updates. Pay attention to its output, and inspect any file that - was marked with a 'C' (as in collision) manually for repairs. - If you already updated it, you can look for collisions in the output of - psyced -d, the command to see differences between the repository - and your local copy of the software. - - * If you still encounter problems, please read (Questions and Answers) - at the beginning of this document. And, as always, come to the developer - chatroom! - - -5. Success! - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - You can now move on to the FIRSTSTEPS document. - Here's the online version, but you have one on your harddisk too. - [10]http://www.psyced.org/FIRSTSTEPS - - - - - - - This document was written by [11]psyc://psyced.org/~lynX - and Marek Schneider ([12]psyc://ve.symlynX.com/~real). - - -- - http://www.psyced.org/INSTALL.html - last change by lynx on lectern at 2009-01-27 23:32:29 CET - -References - - 1. http://www.psyced.org/FIRSTSTEPS - 2. http://www.psyced.org/ - 3. http://lpc.psyc.eu/ - 4. irc://psyced.org/#welcome - 5. http://psyced.org/PSYC/ - 6. telnet://psyced.org/ - 7. http://www.gnu.org/ - 8. http://www.sunfreeware.com/ - 9. http://lpc.psyc.eu/ - 10. http://www.psyced.org/FIRSTSTEPS - 11. irc://psyced.org/lynX,isNick - 12. irc://ve.symlynX.com/real,isNick diff --git a/README.txt b/README.txt deleted file mode 100644 index dba1b30..0000000 --- a/README.txt +++ /dev/null @@ -1,112 +0,0 @@ - -Since you unpacked this you probably want to install it. -You can go straight to the INSTALL.txt file for instructions. -If it is missing, try [1]http://muve.pages.de/INSTALL.html - - - - PROTOCOL for SYNCHRONOUS CONFERENCING - ___ __ _ _ __ _ _ _ _ _ _ ___ - | \ (__ \ / / |\ /| | | | | | - |__/ \ V | | \/ | | | \ / |- - | (__/ | \__ | | |__| V |__ - - The MULTI USER VIRTUAL ENVIRONMENT driver is here! - ============================================= - - - -This is 'psycMUVE', the Multi User Virtual Environment for PSYC. -It is a server and gateway implementation of PSYC. - -The latest version is available on [2]http://muve.pages.de/download - -There is no download by FTP, since FTP has no advantage -over HTTP/1.1 (you can use HTTP REGET these days). - -The project homepage is [3]http://muve.pages.de -The protocol homepage is [4]http://psyc.pages.de -The user manual resides at [5]http://help.pages.de - -The Multi-User Virtual Environment for PSYC-Users isn't just a PSYC server; -it also simulates the functionality of PSYC clients allowing users of various -sorts of more or less dumb applications to enter the PSYCspace. - -The professional edition of it has been in use as a Webchat for several years. -The HTML webchat, however, is not part of the freeware edition. - -psycMUVE is implemented in LPC and uses a driver called LDMUD. -See INSTALL for details. - -The files in the distribution directory are: - AGENDA.txt : future plans (not a TODO really) - BANNER.txt : advertisement or welcome message - COPYLEFT.txt : GNU GENERAL PUBLIC LICENSE - INSTALL.txt : installation hints and notes - LICENSE.txt : something you are supposed to read (copyright info) - README.txt - - install.sh : an installation script (ksh/bash). - [6]makefile : some useful functions (optional). - bin/ : various scripts - but the only one you really need, "psycmuve", - will be created by 'install.sh'. - config/ : depot of configurations. - also contains some tcsh and powwow settings. - data/ : this is where MUVE stores your user and room data. - local/ : your local configuration of the server - is created by 'install.sh' but you can also make - it a symlink into a config/something directory - log/ : where the server logfiles end up. - may be a symlink into the /var partition. - place/ : here you can implement your own room objects in lpc. - some examples of public rooms are waiting for you there. - [7]run/ : the ldmud equivalent of a CGI directory. ldmud can spawn - a subprocess to do some jobs which are too hard to achieve - in LPC-world. we currently don't use this as ldmud provides - MD5 and SHA1 itself. in theory we could implement CGI for - the builtin webserver, but it is much better to code these - things in LPC. [8]world/net/jabber/component.c shows how sha1 -.pl - is spawned when the driver does not provide SHA1. - utility/ : the applet code and other things that may be useful. - [9]world/ : this is the directory tree that is visible from - within the lpc interpreter and therefore contains - all the actual lpc program code. - data/ : symlink to data/ - [10]default/ : the text database for multiple languages and formats - [11]drivers/ : glue code to interface LPC drivers to psycMUVE - local/ : symlink to local/ - log/ : symlink to log/ - [12]net/ : all of the psycMUVE code is in a "net" hierarchy - : so it can be merged with an existing MUD - obj/ : just in case you misconfigured your driver - place/ : symlink to place/ - [13]static/ : contains static files for httpd export - : you can use them with the internal httpd - : or copy them to yours - -Don't be irritated by the fact that traditional LPC drivers keep -their LPC files with a ".c" suffix and data files with a ".o" suffix. -More oddities are described in http://muve.pages.de/DEVELOP if you want -to find your way around the psycMUVE source code. - - -- - http://muve.pages.de/README.html - last change by lynx on fly at 2005-09-28 20:58:37 MEST - -References - - 1. http://muve.pages.de/INSTALL.html - 2. http://muve.pages.de/download - 3. http://muve.pages.de/ - 4. http://psyc.pages.de/ - 5. http://help.pages.de/ - 6. http://muve.pages.de/dist/makefile - 7. http://muve.pages.de/dist/run/ - 8. http://muve.pages.de/dist/world/net/jabber/component.c - 9. http://muve.pages.de/dist/world/ - 10. http://muve.pages.de/dist/world/default/ - 11. http://muve.pages.de/dist/world/drivers/ - 12. http://muve.pages.de/dist/world/net/ - 13. http://muve.pages.de/dist/world/static/ diff --git a/bin/psyconf b/bin/psyconf index cbdd64d..7e390d3 100755 --- a/bin/psyconf +++ b/bin/psyconf @@ -460,27 +460,30 @@ then echo "The file you just saw is: ${hi}${lib}/status-0-DEPRECATED${lo}." exit 1 else - echo "" - echo "${hi}ATTENTION: ${lo}Please give an empty password to log in (-> press enter)" - (cd $sandbox/.. && cvs login && cvs -q update -dP && cvs logout) - fi - if ! test -e $sandbox/status-0-beta-OK - then - echo "" - echo "${hi}ATTENTION:${lo}" - echo "The version of psyced you are using is outdated. You -cannot" - echo "get new updates because of incompatibility." - echo "" - echo "More information following.." - echo "" - cat $sandbox/status-0-DEPRECATED - echo "" - echo "The file you just saw is: ${hi}${lib}/status-0-DEPRECATED${lo}." - exit 1 - else - echo "It may be a good idea to run ${hi}$0${lo} again before you continue." - fi + echo "automated update functionality no longer available. try" + echo "'git fetch origin', optionally 'git diff master..origin/master'" + echo "and finally 'git merge -s resolve origin' instead" + exit 1 +# echo "" +# echo "${hi}ATTENTION: ${lo}Please give an empty password to log in (-> press enter)" +# (cd $sandbox/.. && cvs login && cvs -q update -dP && cvs logout) +# fi +# if ! test -e $sandbox/status-0-beta-OK +# then +# echo "" +# echo "${hi}ATTENTION:${lo}" +# echo "The version of psyced you are using is outdated. You cannot" +# echo "get new updates because of incompatibility." +# echo "" +# echo "More information following.." +# echo "" +# cat $sandbox/status-0-DEPRECATED +# echo "" +# echo "The file you just saw is: ${hi}${lib}/status-0-DEPRECATED${lo}." +# exit 1 +# else +# echo "It may be a good idea to run ${hi}$0${lo} again before you continue." +# fi exit fi @@ -502,7 +505,9 @@ then echo "The file you just saw is: ${hi}${lib}/status-0-DEPRECATED${lo}." exit 1 else - (cd $base && cvs -q diff -ur HEAD|\$PAGER) +# (cd $base && cvs -q diff -ur HEAD|\$PAGER) + echo "diff functionality no longer available. see psyced -u." + exit 1 fi exit fi @@ -656,3 +661,4 @@ X say "\nCaution: You may have to completely shut down and restart psyced\n"; say "to ensure the newly generated start-up scripts are actually used.\n"; +# vim:ts=8 diff --git a/config/gentoo/Makefile b/config/gentoo/Makefile index c45bcb4..3816f96 100644 --- a/config/gentoo/Makefile +++ b/config/gentoo/Makefile @@ -74,9 +74,9 @@ clean: up: -rm ldmud/ldmud-*.ebuild psyced/psyced-*.ebuild psyclpc/psyclpc-*.ebuild -mkdir psyced/files - # If 'cvs update' updates this Makefile itself, it may be necessary + # If version control updates this Makefile itself, it may be necessary # to run 'make up' twice as the update requirements may have changed. - cvs update + git pull $G http://www.psyced.org/dist/config/psyced.ini >psyced/files/psyced.ini @(cd psyced;make ebuild) @(cd psyclpc;make ebuild) diff --git a/config/gentoo/ldmud.ebuild b/config/gentoo/ldmud.ebuild index 4b7d42f..8a7c81f 100644 --- a/config/gentoo/ldmud.ebuild +++ b/config/gentoo/ldmud.ebuild @@ -11,9 +11,8 @@ # Suggestions? tell psyc://psyced.org/~lynX # # WARNING/REMINDER to myself: When checking in a new version of this file -# into CVS I have to run 'make up' in the gentoo download tar, as it also -# relinks all the ldmud/ldmud-VERSION.ebuild files. 'cvs update' alone -# wouldn't do that. +# I have to run 'make up' in the gentoo download tar, as it also +# relinks all the ldmud/ldmud-VERSION.ebuild files. inherit toolchain-funcs eutils diff --git a/config/gentoo/ldmud/Makefile b/config/gentoo/ldmud/Makefile index fc90c29..e4c22df 100644 --- a/config/gentoo/ldmud/Makefile +++ b/config/gentoo/ldmud/Makefile @@ -41,7 +41,7 @@ files/erq: files: -mkdir files -# # we don't want to have each of those in cvs, so this is a place too +# we don't want to have each of those in version control, so this is a place too # echo "MD5 419eb1c21747fe2cd6de8089b47271ff ldmud-3.3.687.tar.bz2 2107415" >files/digest-ldmud-3.3.687 # echo "MD5 ab0027411928bef96aa41bf316cde954 ldmud-3.3.712.tar.gz 26515635" >files/digest-ldmud-3.3.712 diff --git a/config/gentoo/ldmud/files/psyced.settings b/config/gentoo/ldmud/files/psyced.settings index 79d6cb9..9a2c651 100644 --- a/config/gentoo/ldmud/files/psyced.settings +++ b/config/gentoo/ldmud/files/psyced.settings @@ -8,7 +8,7 @@ # implementation of the protocol for synchronous conferencing. # Please execute this instead of ./configure before compilation. # -# The latest version of this file is in the psyced-CVS and usually also +# The latest version of this file is in the psyced repository and usually also # at http://www.psyced.org/dist/config/psyced.settings # The version in the LDMUD distribution may be slightly outdated. # diff --git a/config/gentoo/psyced.ebuild b/config/gentoo/psyced.ebuild index df88b60..a80a1af 100644 --- a/config/gentoo/psyced.ebuild +++ b/config/gentoo/psyced.ebuild @@ -50,13 +50,13 @@ src_unpack() { einfo "Unpacking ${PN}" tar xf data.tar # # only for development purposes -# cvs login && cvs -q update -d && cvs logout +# git pull # things we won't need rm -rf makefile install.sh local data log erq run INSTALL.txt # new: makefile needs to be removed or newer portage will # automatically run 'make install' rm -f world/log world/data world/local world/place - # cvs sometimes comes with funny permissions + # this used to be necessary with cvs chmod -R go-w . } diff --git a/config/gentoo/psyced/Makefile b/config/gentoo/psyced/Makefile index 20b3680..0a4357e 100644 --- a/config/gentoo/psyced/Makefile +++ b/config/gentoo/psyced/Makefile @@ -36,7 +36,7 @@ files/psyced.ini: files: -mkdir files -# we don't want to have each of those in cvs, so this is a place too +# we don't want to have each of those in version control, so this is a place too # echo "MD5 bacce96afd75b8034a9247883f3765e1 psycmuve.99-gamma.tar.gz 587447" >files/digest-psycmuve.99-gamma clean: diff --git a/config/gentoo/psyclpc.ebuild b/config/gentoo/psyclpc.ebuild index e4262c5..20fcdec 100644 --- a/config/gentoo/psyclpc.ebuild +++ b/config/gentoo/psyclpc.ebuild @@ -9,9 +9,8 @@ # Suggestions? tell psyc://psyced.org/~lynX # # WARNING/REMINDER to myself: When checking in a new version of this file -# into CVS I have to run 'make up' in the gentoo download tar, as it also -# relinks all the psyclpc/psyclpc-VERSION.ebuild files. 'cvs update' alone -# wouldn't do that. +# I have to run 'make up' in the gentoo download tar, as it also +# relinks all the psyclpc/psyclpc-VERSION.ebuild files. # # this ebuild file is available in both psyclpc/etc and psyced/config/gentoo. # psyced also provides installation automations. diff --git a/config/psyced.settings b/config/psyced.settings index 79d6cb9..9a2c651 100755 --- a/config/psyced.settings +++ b/config/psyced.settings @@ -8,7 +8,7 @@ # implementation of the protocol for synchronous conferencing. # Please execute this instead of ./configure before compilation. # -# The latest version of this file is in the psyced-CVS and usually also +# The latest version of this file is in the psyced repository and usually also # at http://www.psyced.org/dist/config/psyced.settings # The version in the LDMUD distribution may be slightly outdated. # diff --git a/config/cvs.tcsh b/config/versioncontrol.tcsh similarity index 91% rename from config/cvs.tcsh rename to config/versioncontrol.tcsh index 1cb8db5..e16e5ea 100644 --- a/config/cvs.tcsh +++ b/config/versioncontrol.tcsh @@ -1,6 +1,3 @@ -# you can also create a ~/.cvsrc where you keep your favorite -# cvs flags. we recommend to put 'cvs -z9' in there - alias difvu 'vim -R "+set syntax=diff"' alias cup cvs -q update -dP @@ -37,4 +34,5 @@ alias Cdif '(cd $PSYCEDHOME;cdif)' alias ctoc '(cd $CVSHOME;cvs diff -bur HEAD CHANGESTODO|& difvu -' alias ctodo '(cd $PSYCEDHOME;cvs update CHANGESTODO;$EDITOR CHANGESTODO;cvs ci -m + CHANGESTODO)' +alias todo '(cd $PSYCEDHOME;$EDITOR CHANGESTODO)' diff --git a/install.sh b/install.sh index a38bb04..fdc9378 100755 --- a/install.sh +++ b/install.sh @@ -848,31 +848,23 @@ else echo "[no port rules written.]" fi -# cvs update kann wochenlang nicht zu empfehlen sein. -# wir machen lieber ab sofort immer wenn's grad heile ist -# nen snapshot. dank pkggen kein großes problem. -get WANT_CVSUP "n" - +#get WANT_CVSUP "n" +# # would be soooo smart if we'd ask for update before we even enter # the install.sh interview because frequently there is a better # install.sh in the repo worth running instead. TODO -echo "" -echo "" -echo "The version you are about to install is considered stable," -echo "If you need to run the latest off-the-mill version you can" -echo "update the code tree via CVS. You can choose to do so now or" -echo "anytime later using the -u option of psyced. You can" -echo "even inspect the changes in the code before updating, using" -echo "psyced -d. We think this feature is quite cool." -echo "" -echo "${hi}But be aware, by updating you may be switching" -echo "to an unstable or otherwise unusable version.${lo}" -ask "Update your installation by CVS?" WANT_CVSUP - -#if test "$WANT_CVSUP" != "n" -#then -# echo "Using CVSROOT :pserver:anonymous@andrack.tobij.de:/CVS/anonCVS" -#fi +#echo "" +#echo "" +#echo "The version you are about to install is considered stable," +#echo "If you need to run the latest off-the-mill version you can" +#echo "update the code tree via CVS. You can choose to do so now or" +#echo "anytime later using the -u option of psyced. You can" +#echo "even inspect the changes in the code before updating, using" +#echo "psyced -d. We think this feature is quite cool." +#echo "" +#echo "${hi}But be aware, by updating you may be switching" +#echo "to an unstable or otherwise unusable version.${lo}" +#ask "Update your installation by CVS?" WANT_CVSUP echo "" echo "" @@ -1251,7 +1243,7 @@ rm -f $BASE_DIR/local 2> /dev/null cp -rp "$BASE_DIR/config/blueprint" "$BASE_DIR/local" # # let's make sure it won't happen again ;) -rm -rf "$BASE_DIR/local/CVS" +#rm -rf "$BASE_DIR/local/CVS" if test "$RUNTIME_OUTPUT" = "files" then @@ -1267,19 +1259,19 @@ then fi fi -if ! test "$WANT_CVSUP" = "n" -then - echo "Updating to newest state by using CVS" - echo "Using CVSROOT `cat $BASE_DIR/CVS/Root`" - echo "${hi}ATTENTION: ${lo}Please give an empty password to log in (-> press enter)" - if (cd $BASE_DIR && cvs login && cvs -q update -d && cvs logout) - then - : - else - echo "${hi}Warning: ${lo}Something failed while trying to update. No CVS available?" - echo "The installation should be functioning however, using the stable code." - fi -fi +#if ! test "$WANT_CVSUP" = "n" +#then +# echo "Updating to newest state by using CVS" +# echo "Using CVSROOT `cat $BASE_DIR/CVS/Root`" +# echo "${hi}ATTENTION: ${lo}Please give an empty password to log in (-> press enter)" +# if (cd $BASE_DIR && cvs login && cvs -q update -d && cvs logout) +# then +# : +# else +# echo "${hi}Warning: ${lo}Something failed while trying to update. No CVS available?" +# echo "The installation should be functioning however, using the stable code." +# fi +#fi echo "" echo "Setting permissions for program files..." diff --git a/world/status-0-beta-OK b/world/status-0-beta-OK index ed67bb1..2f06982 100644 --- a/world/status-0-beta-OK +++ b/world/status-0-beta-OK @@ -1,2 +1 @@ -this i a status-file (for cvs update capability of muvelauncher) -and should not be removed. +this file should not be removed.