Merge remote-tracking branch 'origin/NetHack-3.6.0'
This commit is contained in:
@@ -1,10 +1,10 @@
|
||||
___ _
|
||||
| \ _____ _____| |___ _ __ ___ _ _
|
||||
___ _
|
||||
| \ _____ _____| |___ _ __ ___ _ _
|
||||
| |) / -_) V / -_) / _ \ '_ \/ -_) '_|
|
||||
|___/\___|\_/\___|_\___/ .__/\___|_|
|
||||
|_|
|
||||
|___/\___|\_/\___|_\___/ .__/\___|_|
|
||||
|_|
|
||||
|
||||
$NHDT-Date: 1512426817 2017/12/04 22:33:37 $
|
||||
$NHDT-Date: 1518800857 2018/02/16 17:07:37 $
|
||||
|
||||
Welcome to the NetHack Infrastructure Developer's Guide.
|
||||
|
||||
@@ -45,12 +45,15 @@ us an email if that's more appropriate).
|
||||
------------------------------------------------------------------------------
|
||||
4. git configuration
|
||||
|
||||
NOTE: These instructions assume you are on the default branch ("master");
|
||||
this _is_ where you want to be for setting things up. This may or may
|
||||
not be the branch you want to use for your changes; see the appropriate
|
||||
NOTE: These instructions assume you are on the default branch; this _is_
|
||||
where you want to be for setting things up. This may or may not be
|
||||
the branch you want to use for your changes; see the appropriate
|
||||
project private documentation for more information (if you are working
|
||||
alone we suggest using branch names starting with "LOCAL-").
|
||||
|
||||
NOTE: The following instructions require perl. If you do not have perl on
|
||||
your system, please install it before proceeding.
|
||||
|
||||
A. If you have never set up git on this machine before:
|
||||
(This assumes you will only be using git for NetHack. If you are going to
|
||||
use it for other projects as well, think before you type.)
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#!/usr/bin/perl
|
||||
# nhsub
|
||||
# $NHDT-Date: 1515274284 2018/01/06 21:31:24 $
|
||||
# $NHDT-Date: 1518800857 2018/02/16 17:07:37 $
|
||||
|
||||
# Note: was originally called nhdate; the rename is not reflected in the code.
|
||||
|
||||
@@ -245,6 +245,7 @@ my $count = s/\$$PREFIX-(([A-Za-z][A-Za-z0-9_]*)(: ([^\x24]+))?)\$/&handlevar($2
|
||||
# XXX had o modifier, why?
|
||||
return unless($count>0);
|
||||
return if($opt{n});
|
||||
my $mode = 0777 & (stat($file))[2];
|
||||
|
||||
my $ofile = $file . ".nht";
|
||||
open(TOUT, ">", $ofile) or die "Can't open $ofile";
|
||||
@@ -263,6 +264,8 @@ my $count = s/\$$PREFIX-(([A-Za-z][A-Za-z0-9_]*)(: ([^\x24]+))?)\$/&handlevar($2
|
||||
}
|
||||
|
||||
close TOUT or die "Can't close $ofile";
|
||||
# Do the right thing for *nix and hope for the best elsewhere:
|
||||
chmod($mode, $ofile)==1 or warn "Can't set filemode on $ofile";
|
||||
rename $ofile, $file or die "Can't rename $ofile to $file";
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user