nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 04:13:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

scripts/git: Make a master symlink in the worktree directory

Browse Source 
When running git-setup-dirs.sh.

Part of 32347.
This commit is contained in:
teor 2019-10-31 14:24:50 +10:00
parent e046903f93
commit 995618ec61
No known key found for this signature in database
GPG Key ID: 10FEAA0E7075672A
1 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
scripts/git/git-setup-dirs.sh
View File

@ -254,6 +254,25 @@ function make_directory
fi fi
} }
# Create a symlink from the first argument to the second argument
# If the link already exists: fail if $USE_EXISTING is 0, otherwise skip.
function make_symlink
{
local cmd="ln -s '$1' '$2'"
printf " %s Creating symlink from %s to %s..." "$MARKER" "$1" "$2"
local check_cmd="[ ! -e '$2' ]"
msg=$( eval "$check_cmd" 2>&1 )
if validate_ret_skip $? "File already exists."; then
return
fi
if [ $DRY_RUN -eq 0 ]; then
msg=$( eval "$cmd" 2>&1 )
validate_ret $? "$msg"
else
printf "\\n %s\\n" "${IWTH}$cmd${CNRM}"
fi
}
# Go into the directory or repository, even if $DRY_RUN is non-zero. # Go into the directory or repository, even if $DRY_RUN is non-zero.
# If the directory does not exist, fail and log an error. # If the directory does not exist, fail and log an error.
# Otherwise, silently succeed. # Otherwise, silently succeed.
@ -496,7 +515,12 @@ for ((i=0; i<COUNT; i++)); do
printf "%s Handling branch %s\\n" "$MARKER" "${BYEL}$branch${CNRM}" printf "%s Handling branch %s\\n" "$MARKER" "${BYEL}$branch${CNRM}"
# We cloned the repository, and master is the default branch # We cloned the repository, and master is the default branch
if [ "$branch" != "master" ]; then if [ "$branch" = "master" ]; then
if [ "$TOR_MASTER_NAME" != "master" ]; then
# Set up a master link in the worktree directory
make_symlink "$repo_path" "$GIT_PATH/$TOR_WKT_NAME/master"
fi
else
# git makes worktree directories if they don't exist # git makes worktree directories if they don't exist
add_worktree "origin/$branch" "$repo_path" add_worktree "origin/$branch" "$repo_path"
fi fi