Fix typos
This commit is contained in:
parent
8de15394bb
commit
d674d13a68
7 changed files with 26 additions and 25 deletions
2
AUTHORS
2
AUTHORS
|
@ -26,7 +26,7 @@ inorder to implement:
|
||||||
7. a test suite (and support code) to ensure that everything still works.
|
7. a test suite (and support code) to ensure that everything still works.
|
||||||
|
|
||||||
As these changes required a dramatic reorganisation of the code, very little
|
As these changes required a dramatic reorganisation of the code, very little
|
||||||
was left untouched, and so stows major version was bumped up to version 2.
|
was left untouched, and so Stow's major version was bumped up to version 2.
|
||||||
|
|
||||||
Austin Wood <austin.wood@rmit.edu.au> and Chris Hoobin
|
Austin Wood <austin.wood@rmit.edu.au> and Chris Hoobin
|
||||||
<christopher.hoobin@rmit.edu.au> helped clean up the documentation for
|
<christopher.hoobin@rmit.edu.au> helped clean up the documentation for
|
||||||
|
|
6
TODO
6
TODO
|
@ -5,13 +5,13 @@
|
||||||
* Update stow.texi
|
* Update stow.texi
|
||||||
- The email address in 'Reporting Bugs' needs to be updated
|
- The email address in 'Reporting Bugs' needs to be updated
|
||||||
|
|
||||||
* Figure out what needs the optin 'nostow' 'notstowed'. Can they be removed?
|
* Figure out what needs the option 'nostow' 'notstowed'. Can they be removed?
|
||||||
|
|
||||||
* _texi2man_ needs author/copyright/license to be completed
|
* _texi2man_ needs author/copyright/license to be completed
|
||||||
|
|
||||||
* Update http://directory.fsf.org/project/stow/
|
* Update http://directory.fsf.org/project/stow/
|
||||||
|
|
||||||
* Update savanaugh CVS
|
* Update savannah CVS
|
||||||
|
|
||||||
* Check that all email addresses are working: need an account on fenchpost for
|
* Check that all email addresses are working: need an account on fenchpost for
|
||||||
this bug-stow@gnu.org, help-stow@gnu.org
|
this bug-stow@gnu.org, help-stow@gnu.org
|
||||||
|
@ -45,5 +45,5 @@ From e-mail with meyering@na-net.ornl.gov:
|
||||||
|
|
||||||
Does Version 2 fix this? (Kal)
|
Does Version 2 fix this? (Kal)
|
||||||
I think that because it never needs to create /usr/local/info,
|
I think that because it never needs to create /usr/local/info,
|
||||||
it only needs to check th ownership of links that it _operatates_ on,
|
it only needs to check the ownership of links that it _operates_ on,
|
||||||
not on all the elements of the path.
|
not on all the elements of the path.
|
||||||
|
|
26
stow.in
26
stow.in
|
@ -61,14 +61,14 @@ our $Stow_Path; # only use in main loop and find_stowed_path()
|
||||||
# Store conflicts during pre-processing
|
# Store conflicts during pre-processing
|
||||||
our @Conflicts = ();
|
our @Conflicts = ();
|
||||||
|
|
||||||
# Store command line packges to stow (-S and -R)
|
# Store command line packages to stow (-S and -R)
|
||||||
our @Pkgs_To_Stow = ();
|
our @Pkgs_To_Stow = ();
|
||||||
|
|
||||||
# Store command line packages to unstow (-D and -R)
|
# Store command line packages to unstow (-D and -R)
|
||||||
our @Pkgs_To_Delete = ();
|
our @Pkgs_To_Delete = ();
|
||||||
|
|
||||||
# The following structures are used by the abstractions that allow us to
|
# The following structures are used by the abstractions that allow us to
|
||||||
# defer operating on the filesystem until after all potential conflcits have
|
# defer operating on the filesystem until after all potential conflicts have
|
||||||
# been assessed.
|
# been assessed.
|
||||||
|
|
||||||
# our @Tasks: list of operations to be performed (in order)
|
# our @Tasks: list of operations to be performed (in order)
|
||||||
|
@ -82,12 +82,12 @@ our @Pkgs_To_Delete = ();
|
||||||
our @Tasks = ();
|
our @Tasks = ();
|
||||||
|
|
||||||
# my %Dir_Task_For: map a path to the corresponding directory task reference
|
# my %Dir_Task_For: map a path to the corresponding directory task reference
|
||||||
# This structurew allows us to quickly determine if a path has an existing
|
# This structure allows us to quickly determine if a path has an existing
|
||||||
# directory task associated with it.
|
# directory task associated with it.
|
||||||
our %Dir_Task_For = ();
|
our %Dir_Task_For = ();
|
||||||
|
|
||||||
# my %Link_Task_For: map a path to the corresponding directory task reference
|
# my %Link_Task_For: map a path to the corresponding directory task reference
|
||||||
# This structurew allows us to quickly determine if a path has an existing
|
# This structure allows us to quickly determine if a path has an existing
|
||||||
# directory task associated with it.
|
# directory task associated with it.
|
||||||
our %Link_Task_For = ();
|
our %Link_Task_For = ();
|
||||||
|
|
||||||
|
@ -269,7 +269,7 @@ sub process_options {
|
||||||
# Returns : n/a
|
# Returns : n/a
|
||||||
# Throws : no exceptions
|
# Throws : no exceptions
|
||||||
# Comments : prepends the contents '~/.stowrc' and '.stowrc' to the command
|
# Comments : prepends the contents '~/.stowrc' and '.stowrc' to the command
|
||||||
# : line so they get parsed just like noremal arguments. (This was
|
# : line so they get parsed just like normal arguments. (This was
|
||||||
# : hacked in so that Emil and I could set different preferences).
|
# : hacked in so that Emil and I could set different preferences).
|
||||||
#=============================================================================
|
#=============================================================================
|
||||||
sub get_defaults {
|
sub get_defaults {
|
||||||
|
@ -435,9 +435,9 @@ sub stow_contents {
|
||||||
#===== SUBROUTINE ===========================================================
|
#===== SUBROUTINE ===========================================================
|
||||||
# Name : stow_node()
|
# Name : stow_node()
|
||||||
# Purpose : stow the given node
|
# Purpose : stow the given node
|
||||||
# Parameters: $path => realtive path to source node from the current directory
|
# Parameters: $path => relative path to source node from the current directory
|
||||||
# : $target => realtive path to symlink target from the current directory
|
# : $target => relative path to symlink target from the current directory
|
||||||
# : $source => realtive path to symlink source from the dir of target
|
# : $source => relative path to symlink source from the dir of target
|
||||||
# Returns : n/a
|
# Returns : n/a
|
||||||
# Throws : fatal exception if a conflict arises
|
# Throws : fatal exception if a conflict arises
|
||||||
# Comments : stow_node() and stow_contents() are mutually recursive
|
# Comments : stow_node() and stow_contents() are mutually recursive
|
||||||
|
@ -455,7 +455,7 @@ sub stow_node {
|
||||||
warn "--- $target => $source\n";
|
warn "--- $target => $source\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
# don't try to stow absolute symlinks (they cant be unstowed)
|
# don't try to stow absolute symlinks (they can't be unstowed)
|
||||||
if (-l $source) {
|
if (-l $source) {
|
||||||
my $second_source = read_a_link($source);
|
my $second_source = read_a_link($source);
|
||||||
if ($second_source =~ m{\A/} ) {
|
if ($second_source =~ m{\A/} ) {
|
||||||
|
@ -640,9 +640,9 @@ sub unstow_node_orig {
|
||||||
return; # XXX #
|
return; # XXX #
|
||||||
}
|
}
|
||||||
|
|
||||||
# does the existing $target actually point to anything
|
# does the existing $target actually point to anything?
|
||||||
if (-e $old_path) {
|
if (-e $old_path) {
|
||||||
# does link points to the right place
|
# does link point to the right place?
|
||||||
if ($old_path eq $path) {
|
if ($old_path eq $path) {
|
||||||
do_unlink($target);
|
do_unlink($target);
|
||||||
}
|
}
|
||||||
|
@ -1187,7 +1187,7 @@ sub process_tasks {
|
||||||
# Returns : Boolean
|
# Returns : Boolean
|
||||||
# Throws : none
|
# Throws : none
|
||||||
# Comments : returns false if an existing link is scheduled for removal
|
# Comments : returns false if an existing link is scheduled for removal
|
||||||
# : and true if a non-exsitent link is scheduled for creation
|
# : and true if a non-existent link is scheduled for creation
|
||||||
#============================================================================
|
#============================================================================
|
||||||
sub is_a_link {
|
sub is_a_link {
|
||||||
my ($path) = @_;
|
my ($path) = @_;
|
||||||
|
@ -1698,7 +1698,7 @@ sub relative_path {
|
||||||
}
|
}
|
||||||
|
|
||||||
#===== SUBROUTINE ===========================================================
|
#===== SUBROUTINE ===========================================================
|
||||||
# Name : join_path()
|
# Name : join_paths()
|
||||||
# Purpose : concatenates given paths
|
# Purpose : concatenates given paths
|
||||||
# Parameters: path1, path2, ... => paths
|
# Parameters: path1, path2, ... => paths
|
||||||
# Returns : concatenation of given paths
|
# Returns : concatenation of given paths
|
||||||
|
|
|
@ -388,7 +388,7 @@ directory.
|
||||||
The following options are deprecated:
|
The following options are deprecated:
|
||||||
@end table
|
@end table
|
||||||
|
|
||||||
The following options are deprecated as of Stow Version 2:
|
The following options are deprecated as of Stow version 2:
|
||||||
@table @samp
|
@table @samp
|
||||||
@item -c
|
@item -c
|
||||||
@itemx --conflicts
|
@itemx --conflicts
|
||||||
|
@ -400,7 +400,8 @@ This option is deprecated as conflicts are now printed by default and no
|
||||||
operations will be performed if any conflicts are detected.
|
operations will be performed if any conflicts are detected.
|
||||||
@end table
|
@end table
|
||||||
|
|
||||||
@ref{Resource Files} for a way to set default values for any of these options
|
@ref{Resource Files} for a way to set default values for any of these
|
||||||
|
options.
|
||||||
|
|
||||||
|
|
||||||
@c ===========================================================================
|
@c ===========================================================================
|
||||||
|
@ -480,7 +481,7 @@ current stow directory. @emph{Stow will never delete anything
|
||||||
that it doesn't own}. Stow ``owns'' everything living in the
|
that it doesn't own}. Stow ``owns'' everything living in the
|
||||||
target tree that points into a package in the stow directory. Anything
|
target tree that points into a package in the stow directory. Anything
|
||||||
Stow owns, it can recompute if lost: symlinks that point into a package in
|
Stow owns, it can recompute if lost: symlinks that point into a package in
|
||||||
the stow directory, or directories that only contain sysmlinks that stow
|
the stow directory, or directories that only contain symlinks that stow
|
||||||
``owns''. Note that by this definition, Stow doesn't ``own'' anything
|
``owns''. Note that by this definition, Stow doesn't ``own'' anything
|
||||||
@emph{in} the stow directory or in any of the packages.
|
@emph{in} the stow directory or in any of the packages.
|
||||||
|
|
||||||
|
|
2
t/relative_path.t
Normal file → Executable file
2
t/relative_path.t
Normal file → Executable file
|
@ -12,7 +12,7 @@ use Test::More tests => 5;
|
||||||
is(
|
is(
|
||||||
relative_path('a/b/c', 'a/b/d'),
|
relative_path('a/b/c', 'a/b/d'),
|
||||||
'../d',
|
'../d',
|
||||||
=> 'diferent branches'
|
=> 'different branches'
|
||||||
);
|
);
|
||||||
|
|
||||||
is(
|
is(
|
||||||
|
|
|
@ -157,7 +157,7 @@ $Option{'verbose'} = 0;
|
||||||
make_dir('stow'); # make out stow dir a subdir of target
|
make_dir('stow'); # make out stow dir a subdir of target
|
||||||
$Stow_Path = 'stow';
|
$Stow_Path = 'stow';
|
||||||
|
|
||||||
# emulate stowing into ourself (bizzare corner case or accident)
|
# emulate stowing into ourself (bizarre corner case or accident)
|
||||||
make_dir('stow/pkg7a/stow/pkg7b');
|
make_dir('stow/pkg7a/stow/pkg7b');
|
||||||
make_file('stow/pkg7a/stow/pkg7b/file7b');
|
make_file('stow/pkg7a/stow/pkg7b/file7b');
|
||||||
make_link('stow/pkg7b', '../stow/pkg7a/stow/pkg7b');
|
make_link('stow/pkg7b', '../stow/pkg7a/stow/pkg7b');
|
||||||
|
@ -187,7 +187,7 @@ $Stow_Path = 'stow';
|
||||||
make_dir('stow2'); # make our alternate stow dir a subdir of target
|
make_dir('stow2'); # make our alternate stow dir a subdir of target
|
||||||
make_file('stow2/.stow');
|
make_file('stow2/.stow');
|
||||||
|
|
||||||
# emulate stowing into ourself (bizzare corner case or accident)
|
# emulate stowing into ourself (bizarre corner case or accident)
|
||||||
make_dir('stow/pkg8a/stow2/pkg8b');
|
make_dir('stow/pkg8a/stow2/pkg8b');
|
||||||
make_file('stow/pkg8a/stow2/pkg8b/file8b');
|
make_file('stow/pkg8a/stow2/pkg8b/file8b');
|
||||||
make_link('stow2/pkg8b', '../stow/pkg8a/stow2/pkg8b');
|
make_link('stow2/pkg8b', '../stow/pkg8a/stow2/pkg8b');
|
||||||
|
|
|
@ -159,7 +159,7 @@ $Option{'verbose'} = 0;
|
||||||
make_dir('stow'); # make out stow dir a subdir of target
|
make_dir('stow'); # make out stow dir a subdir of target
|
||||||
$Stow_Path = 'stow';
|
$Stow_Path = 'stow';
|
||||||
|
|
||||||
# emulate stowing into ourself (bizzare corner case or accident)
|
# emulate stowing into ourself (bizarre corner case or accident)
|
||||||
make_dir('stow/pkg7a/stow/pkg7b');
|
make_dir('stow/pkg7a/stow/pkg7b');
|
||||||
make_file('stow/pkg7a/stow/pkg7b/file7b');
|
make_file('stow/pkg7a/stow/pkg7b/file7b');
|
||||||
make_link('stow/pkg7b', '../stow/pkg7a/stow/pkg7b');
|
make_link('stow/pkg7b', '../stow/pkg7a/stow/pkg7b');
|
||||||
|
@ -189,7 +189,7 @@ $Stow_Path = 'stow';
|
||||||
make_dir('stow2'); # make our alternate stow dir a subdir of target
|
make_dir('stow2'); # make our alternate stow dir a subdir of target
|
||||||
make_file('stow2/.stow');
|
make_file('stow2/.stow');
|
||||||
|
|
||||||
# emulate stowing into ourself (bizzare corner case or accident)
|
# emulate stowing into ourself (bizarre corner case or accident)
|
||||||
make_dir('stow/pkg8a/stow2/pkg8b');
|
make_dir('stow/pkg8a/stow2/pkg8b');
|
||||||
make_file('stow/pkg8a/stow2/pkg8b/file8b');
|
make_file('stow/pkg8a/stow2/pkg8b/file8b');
|
||||||
make_link('stow2/pkg8b', '../stow/pkg8a/stow2/pkg8b');
|
make_link('stow2/pkg8b', '../stow/pkg8a/stow2/pkg8b');
|
||||||
|
|
Loading…
Reference in a new issue