From 19aab6b349d49f00eeaa23b86d08b00078e03848 Mon Sep 17 00:00:00 2001 From: "psyc://psyced.org/~lynX" <@> Date: Wed, 24 Feb 2010 09:02:54 +0100 Subject: [PATCH 1/3] use git-stash instead of fake commit --- CHANGESTODO | 7 +++++++ bin/psyconf | 14 +++++++++----- world/net/twitter/client.c | 2 +- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/CHANGESTODO b/CHANGESTODO index f683b68..8635d99 100644 --- a/CHANGESTODO +++ b/CHANGESTODO @@ -378,6 +378,7 @@ ________________________________________________________________________ - parse.i erlaubt es den begrüßungspunkt wegzulassen wenn man stattdessen ne leerzeile liefert. aua -- egal, wir wechseln auf spyc +- auch derb, er akzeptiert ".xx" statt "." - /silence conversation doesn't filter /action @@ -3996,6 +3997,12 @@ person, user usercmd + /forceenter only exists temporarily to circumvent a bug - immediately show presence of a newly acquired friend, thx tg +http/fetch ++ POST support +new: http/oauth userthreads, threads, accept etc + experimental microblogging on your web profile, thx tg #define _flag_enable_module_microblogging ++ twitter submit ++ signatures + diff --git a/bin/psyconf b/bin/psyconf index d10d57a..7acdab6 100755 --- a/bin/psyconf +++ b/bin/psyconf @@ -459,11 +459,11 @@ then # echo "and finally 'git merge -s resolve origin' instead" # exit 1 # echo "${hi}ATTENTION: ${lo}Please give an empty password to log in (-> press enter)" -## (cd $sandbox/.. && cvs login && cvs -q update -dP && cvs logout) +## (cd $base && cvs login && cvs -q update -dP && cvs logout) echo "" echo "Fetching update from public git repository..." echo "" - (cd $sandbox/.. && git fetch origin) + (cd $base && git fetch origin) echo "" echo "You can now read the changes using ${hi}\$0 -d${lo}" echo "or activate the changes using ${hi}\$0 -m${lo}" @@ -496,11 +496,15 @@ fi if test "\$1" = "-m" then - # git is seriously unsuited for this job. we need to "check in" the changes - # to file permissions etc or otherwise we can't update things at all... - (cd $base && git commit -a -m 'automatic by psyced -m') +# # git is seriously unsuited for this job. we need to "check in" the changes +# # to file permissions etc or otherwise we can't update things at all... +# (cd $base && git commit -a -m 'automatic by psyced -m') + # stash local changes + (cd $base && git stash) # merging will of course fail.. sigh (cd $base && git merge -s resolve origin) + # restore local changes + (cd $base && git stash apply) exit fi diff --git a/world/net/twitter/client.c b/world/net/twitter/client.c index 5d43138..83ef4d5 100644 --- a/world/net/twitter/client.c +++ b/world/net/twitter/client.c @@ -1,6 +1,6 @@ /* twitter client * - * - register @ http://twitter.com/apps + * - register @ https://twitter.com/apps * - settings: * - app name: e.g. psyc://your.host/ * - app type: browser From 0df57a44453a83c2e3458e1f99d1fac40a19032d Mon Sep 17 00:00:00 2001 From: "psyc://psyced.org/~lynX" <@> Date: Wed, 24 Feb 2010 09:40:31 +0100 Subject: [PATCH 2/3] psyconf: look also in /usr/local/sbin --- bin/psyconf | 82 +++++++++++++++++++++++++---------------------------- 1 file changed, 39 insertions(+), 43 deletions(-) diff --git a/bin/psyconf b/bin/psyconf index 7acdab6..b03797e 100755 --- a/bin/psyconf +++ b/bin/psyconf @@ -121,35 +121,37 @@ sub say { unless -x $base; my $sandbox = "$base/world"; die "psyced library $sandbox does not exist" unless -x $sandbox; - my $arch = "$base/bin-$_type_architecture"; + my $execs = "$base/bin-$_type_architecture"; my $config = $c{_basic_path_configuration} || $base; # this isn't taking $ARCH_DIR from install.sh into account # but maybe it shouldn't anyway.. - say "Looking for driver in $arch/$driver\n"; - unless (-x $arch && -x "$arch/$driver") { - $arch = "$base/bin-$_type_system"; - say "Looking for driver in $arch/$driver\n"; - unless (-x $arch && -x "$arch/$driver") { - $arch = "$base/bin-linux"; - say "Looking for driver in $arch/$driver\n"; - if (-x $arch && -x "$arch/$driver") { - say "\nBug in $0: We didn't find $base/bin-linux in the appropriate way.\nThat's not nice. Continuing however.\n" - } elsif (not -x ($arch = "$base/bin") && -x "$arch/$driver") { - say "Looking for driver in $arch/$driver\n"; - # bad place for psyclpc really.. - # since it is usually of no commandline use - # but where else should psyclpc.ebuild - # install it? in /opt/psyclpc? for two files? - $arch = "/usr/sbin"; - say "Looking for driver in $arch/$driver\n"; - # the following is very unlikely to happen: - die <', $t or die "Cannot write to $t"; my $db = $c{_optional_level_debug} || '0'; - my $psyced = "$arch/$driver -DDEBUG=$db"; + my $psyced = "$execs/$driver -DDEBUG=$db"; my $debugfile; if ( $c{_optional_use_file_debug} ) { @@ -454,18 +456,12 @@ if test "\$1" = "-u" then if test -e $sandbox/status-0-beta-OK then -# 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 "${hi}ATTENTION: ${lo}Please give an empty password to log in (-> press enter)" -## (cd $base && cvs login && cvs -q update -dP && cvs logout) echo "" echo "Fetching update from public git repository..." echo "" - (cd $base && git fetch origin) + git fetch origin echo "" - echo "You can now read the changes using ${hi}\$0 -d${lo}" + echo "You can now look at the changes using ${hi}\$0 -d${lo}" echo "or activate the changes using ${hi}\$0 -m${lo}" fi if ! test -e $sandbox/status-0-beta-OK @@ -482,34 +478,34 @@ then 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." + # this \$0 is for psyconf, not for psyced.. don't escape it + echo "" + echo "It may be a good idea to run ${hi}$0${lo} again before you continue." fi exit fi if test "\$1" = "-d" then -## (cd $base && cvs -q diff -ur HEAD|\$PAGER) - (cd $base && git diff master..origin/master | \$PAGER) +## cvs -q diff -ur HEAD|\$PAGER + git diff master..origin/master | \$PAGER exit fi if test "\$1" = "-m" then -# # git is seriously unsuited for this job. we need to "check in" the changes -# # to file permissions etc or otherwise we can't update things at all... -# (cd $base && git commit -a -m 'automatic by psyced -m') - # stash local changes - (cd $base && git stash) - # merging will of course fail.. sigh - (cd $base && git merge -s resolve origin) - # restore local changes - (cd $base && git stash apply) + git stash save 'changes stashed automatically by psyced -m' + git merge -s resolve origin + # restore local changes? +# git stash apply + echo "" + echo "If you had local changes to your files you can now restore them using" + echo "${hi}git stash apply${lo}" exit fi # if your ldmud is too old, it may not understand --pidfile and --tls-* -commandline="$psyced -s 0 -s v0 --swap-file $base/psyced.swap --erq $arch/erq --pidfile $sandbox/data/$driver.pid -m $sandbox -u $portUDP $ports" +commandline="$psyced -s 0 -s v0 --swap-file $base/psyced.swap --erq $execs/erq --pidfile $sandbox/data/$driver.pid -m $sandbox -u $portUDP $ports" # keep the pid of this wrapper process, too echo \$\$ >data/psyced.pid From 446a3006a8576dfa0ca60d41b7d28bf01156d713 Mon Sep 17 00:00:00 2001 From: "psyc://psyced.org/~lynX" <@> Date: Wed, 24 Feb 2010 12:03:44 +0100 Subject: [PATCH 3/3] + --- world/default/en/html.textdb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/world/default/en/html.textdb b/world/default/en/html.textdb index 1c1d4bd..d8a08a4 100644 --- a/world/default/en/html.textdb +++ b/world/default/en/html.textdb @@ -1352,8 +1352,9 @@ _PAGES_start_description |