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

psyconf generates a psyced script which supports git commands

Browse Source
This commit is contained in:
psyc://psyced.org/~lynX 2009-03-03 03:38:38 +01:00
parent 43bd8835f7
commit e4017f34e1
2 changed files with 35 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -7,6 +7,8 @@ CVS
.#* .#*
world/net/place/_*.c world/net/place/_*.c
world/net/include/place.i world/net/include/place.i
README.txt
INSTALL.txt
*~ *~
*.swf *.swf
*.swp *.swp

85
bin/psyconf
View File

@ -426,26 +426,41 @@ then
fi fi
X X
# it's not a security issue really, but shouldn't control files
# like status-0-beta-OK be outside the sandbox? -lynX
print O <<X; print O <<X;
umask $umask umask $umask
# with this chdir, old ldmud should be able to find its keys anyhow # with this chdir, old ldmud should be able to find its keys anyhow
cd $base cd $base
# available flags: -u and -d # available flags: -u, -d and -m
# TODO: i'd like for -b to make a backup archive of the psyced tree before # TODO: i'd like for -b to make a backup archive of the psyced tree before
# updating, and -r to revert to the last backupped version. whatchathink? # updating, and -r to revert to the last backupped version. whatchathink?
# the following if-block handles the -u option for updating your # the following if-block handles the -u option for updating your
# installation by CVS. it ensures your installation is still basically # installation by git. it ensures your installation is still basically
# compatible with the one in the CVS or complains. # compatible with the one in the git or complains.
# #
if test "\$1" = "-u" if test "\$1" = "-u"
then then
# it's not a security issue really, if test -e $sandbox/status-0-beta-OK
# but shouldn't these CVS control then
# files by outside the sandbox? -lynX # 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 $sandbox/.. && cvs login && cvs -q update -dP && cvs logout)
echo ""
echo "Fetching update from public git repository..."
echo ""
(cd $sandbox/.. && 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}"
fi
if ! test -e $sandbox/status-0-beta-OK if ! test -e $sandbox/status-0-beta-OK
then then
echo "" echo ""
@ -454,61 +469,27 @@ then
echo "get new updates because of incompatibility." echo "get new updates because of incompatibility."
echo "" echo ""
echo "More information following.." echo "More information following.."
echo "" echo ""
cat $sandbox/status-0-DEPRECATED cat $sandbox/status-0-DEPRECATED
echo "" echo ""
echo "The file you just saw is: ${hi}${lib}/status-0-DEPRECATED${lo}." echo "The file you just saw is: ${hi}${lib}/status-0-DEPRECATED${lo}."
exit 1 exit 1
else else
echo "automated update functionality no longer available. try" echo "It may be a good idea to run ${hi}\$0${lo} again before you continue."
echo "'git fetch origin', optionally 'git diff master..origin/master'" fi
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 exit
fi fi
# the -d option let's you inspect all the changes done in the CVS
# before you go for an update using -u
if test "\$1" = "-d" if test "\$1" = "-d"
then then
if ! test -e $sandbox/status-0-beta-OK ## (cd $base && cvs -q diff -ur HEAD|\$PAGER)
then (cd $base && git diff master..origin/master | \$PAGER)
echo "" exit
echo "${hi}ATTENTION:${lo}" fi
echo "The version of psyced you are using is outdated. You cannot"
echo "get new updates because of incompatibility." if test "\$1" = "-m"
echo "" then
echo "More information following.." (cd $base && git merge -s resolve origin)
echo ""
cat $sandbox/status-0-DEPRECATED
echo ""
echo "The file you just saw is: ${hi}${lib}/status-0-DEPRECATED${lo}."
exit 1
else
# (cd $base && cvs -q diff -ur HEAD|\$PAGER)
echo "diff functionality no longer available. see psyced -u."
exit 1
fi
exit exit
fi fi