ChronosXYZ/psyced
1
0
Fork 0
mirror of https://github.com/ChronosX88/psyced.git synced 2024-11-09 20:11:00 +00:00
Code Issues Projects Releases Wiki Activity

+

Browse Source
This commit is contained in:
psyc://psyced.org/~lynX 2009-04-09 10:51:54 +02:00
commit 452e228a14
2 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
install.sh
View File

@ -1,18 +1,20 @@
#!/bin/sh #!/bin/sh
#
# new age sh (SUSv2 etc) are supposed to handle our syntax # new age sh (SUSv2 etc) are supposed to handle our syntax
# but if that's not true, try a bash or ksh here. # but if that's not true, try a bash or ksh here.
# #
# psyced installation script
# $Id: install.sh,v 1.165 2008/10/16 13:07:13 lynx Exp $
#
# original version by oswald!osw@ld.pages.de on IRCnet, 22aug00
# heavy improvements by heldensaga and psyc://psyced.org/~lynX
# switched from function foo to foo() syntax as suggested by cebewee
#
# we could also use a strategy for finding the best bash or ksh # we could also use a strategy for finding the best bash or ksh
# on this system and re-execing ourselves because an old bourne # on this system and re-execing ourselves because an old bourne
# shell will not be able to deal with this script completely # shell will not be able to deal with this script completely
####### psyced installation script #######
#
# original version 2000-08-22 by Kai 'Oswald' Seidler (oswaldism.de)
# heavy improvements by heldensaga and psyc://psyced.org/~lynX
# switched from function foo to foo() syntax as suggested by cebewee
#
#######
# Use 'ldmud' here if you want to use an ldmud rather than a psyclpc' # Use 'ldmud' here if you want to use an ldmud rather than a psyclpc'
#driver="ldmud" #driver="ldmud"
#zip="gz" #zip="gz"
@ -1077,11 +1079,7 @@ then
echo "Creating $BASE_DIR..." echo "Creating $BASE_DIR..."
if mkdir -m $BASE_PERM -p $BASE_DIR 2> /dev/null if mkdir -m $BASE_PERM -p $BASE_DIR 2> /dev/null
then then
mkdir -m $BASE_PERM -p $LOG_DIR 2> /dev/null ;
mkdir -m $BASE_PERM -p $LOG_DIR/place 2> /dev/null
mkdir -m $BASE_PERM -p $DATA_DIR 2> /dev/null
mkdir -m $BASE_PERM -p $DATA_DIR/person 2> /dev/null
mkdir -m $BASE_PERM -p $DATA_DIR/place 2> /dev/null
else else
if test "x$userid" = "xroot" if test "x$userid" = "xroot"
then then
@ -1122,7 +1120,16 @@ else
$exit $exit
fi fi
# we need to be completely sure these directories exist,
# so we just go ahead with brute force :)
#
mkdir -m $BASE_PERM -p $LOG_DIR 2> /dev/null
mkdir -m $BASE_PERM -p $LOG_DIR/place 2> /dev/null
mkdir -m $BASE_PERM -p $DATA_DIR 2> /dev/null
mkdir -m $BASE_PERM -p $DATA_DIR/person 2> /dev/null
mkdir -m $BASE_PERM -p $DATA_DIR/place 2> /dev/null
mkdir -p $ARCH_DIR 2>/dev/null mkdir -p $ARCH_DIR 2>/dev/null
if test -d $ARCH_DIR if test -d $ARCH_DIR
then then
if test ! -w $ARCH_DIR if test ! -w $ARCH_DIR
@ -1208,11 +1215,10 @@ EOF
# # TODO: don't say this if either $driver or erq failed to compile! # # TODO: don't say this if either $driver or erq failed to compile!
# echo "${hi}COMPILATION DONE${lo}" # echo "${hi}COMPILATION DONE${lo}"
echo "" echo ""
fi
# i have a feeling i should be using ARCH_DIR here # i have a feeling i should be using ARCH_DIR here
if test -d bin-$arch if test -d bin-$arch
then then
cd bin-$arch cd bin-$arch
for i in * for i in *
do do
@ -1224,9 +1230,10 @@ EOF
done done
cd .. cd ..
else else
echo "${hi}WARNING:${lo} Couldn't install architecture dependent binaries because I can't find them!" echo "${hi}WARNING:${lo} Couldn't install architecture dependent binaries because I can't find them!"
echo "" echo ""
fi
fi fi
else else
echo "Hmm.. couldn't create $ARCH_DIR! Aborting." echo "Hmm.. couldn't create $ARCH_DIR! Aborting."

8
world/net/person.c
View File

@ -1638,8 +1638,12 @@ case "_notice_invitation":
case "_message_private_question": case "_message_private_question":
case "_message_private": case "_message_private":
// same filtering code as couple lines above // same filtering code as couple lines above
if (( IS_NEWBIE || !itsme && FILTERED(source)) && if ((
(!profile || profile[PPL_NOTIFY] <= PPL_NOTIFY_PENDING)) { #ifndef _flag_enable_unauthenticated_message_private
IS_NEWBIE ||
#endif
(!itsme && FILTERED(source)) &&
(!profile || profile[PPL_NOTIFY] <= PPL_NOTIFY_PENDING))) {
PT(("_failure_filter_strangers to %O from %O\n", source, ME)) PT(("_failure_filter_strangers to %O from %O\n", source, ME))
sendmsg(source, "_failure_filter_strangers", 0, sendmsg(source, "_failure_filter_strangers", 0,
([ "_nick" : MYNICK ]) ); ([ "_nick" : MYNICK ]) );