Skip to content

Fix relative symlink target generation #168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
karreiro wants to merge 1 commit into
base: master
Choose a base branch
from
+28 −2
Open

Fix relative symlink target generation #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/fileutils.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -715,7 +715,7 @@ def cp_lr(src, dest, noop: nil, verbose: nil,
# Keyword arguments:
#
# - <tt>force: true</tt> - overwrites +dest+ if it exists.
# - <tt>relative: false</tt> - create links relative to +dest+.
# - <tt>relative: true</tt> - create links relative to +dest+.
# - <tt>noop: true</tt> - does not create links.
# - <tt>verbose: true</tt> - prints an equivalent command:
#
Expand Down Expand Up @@ -783,7 +783,7 @@ def ln_sr(src, dest, target_directory: true, force: nil, noop: nil, verbose: nil
n = real_ddirs.size - i
n -= 1 unless target_directory
link2 = fu_clean_components(*Array.new([n, 0].max, '..'), *real_sdirs[i..-1])
link1 = link2 if link1.size > link2.size
link1 = link2 if !link2.empty? and link1.size > link2.size
end
s = File.join(link1)
fu_output_message [cmd, s, d].flatten.join(' ') if verbose
Expand Down
26 changes: 26 additions & 0 deletions test/fileutils/test_fileutils.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -979,6 +979,32 @@ def test_ln_s
end
end if have_symlink? and !no_broken_symlink?

def test_ln_s_relative_to_symlinked_directory
mkdir_p 'tmp/symlink_dir/.dotfiles/zsh'
mkdir_p 'tmp/symlink_dir/.config'

src = File.expand_path('tmp/symlink_dir/.dotfiles/zsh')
dest = File.expand_path('tmp/symlink_dir/.config/zsh')

assert_output_lines(["ln -s ../.dotfiles/zsh #{dest}"]) {
ln_s src, dest, relative: true, verbose: true, noop: true
}

ln_s src, dest, relative: true
assert_file.symlink?(dest)
assert_equal '../.dotfiles/zsh', File.readlink(dest)

lnfname = File.join(dest, 'zsh')
assert_output_lines(["ln -s ../../.dotfiles/zsh #{lnfname}"]) {
ln_s src, dest, relative: true, verbose: true, noop: true
}

ln_s src, dest, relative: true
assert_file.symlink?(lnfname)
assert_equal '../../.dotfiles/zsh', File.readlink(lnfname)
assert_equal File.realpath(src), File.realpath(lnfname)
end if have_symlink? and !no_broken_symlink?

def test_ln_s_broken_symlink
assert_nothing_raised {
ln_s 'symlink', 'tmp/symlink'
Expand Down