Skip to content
This repository was archived by the owner on Apr 16, 2024. It is now read-only.

Commit c9cdf7c

Browse files
committed
fix(tools,docker): Fix docker script using old dev branch
1 parent 5cdc229 commit c9cdf7c

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

tools/start_docker.sh

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ if [[ ! -d "$SCRIPT_DIR"/doom-nvim-contrib ]]; then
4949
if git show-ref --quiet refs/heads/"$BRANCH_NAME"; then
5050
git worktree add ./doom-nvim-contrib "$BRANCH_NAME"
5151
else
52-
git worktree add ./doom-nvim-contrib origin/develop -b "$BRANCH_NAME"
52+
git worktree add ./doom-nvim-contrib origin/main -b "$BRANCH_NAME"
5353
fi
5454
fi
5555

@@ -71,8 +71,8 @@ else
7171
git checkout -b "$BRANCH_NAME" main
7272
git fetch --quiet
7373
# If changes between local and origin, get latest changes
74-
if [[ ! $( git rev-list develop...origin/develop --count ) -eq 0 ]]; then
75-
echo " - WARN: There are upstream changes to develop branch. Please pull latest changes"
74+
if [[ ! $( git rev-list main...origin/main --count ) -eq 0 ]]; then
75+
echo " - WARN: There are upstream changes to main branch. Please pull latest changes"
7676
read -p " Do you want to continue creating $BRANCH_NAME? (y/n) " -n 1 -r
7777
fi
7878
# Create new branch for feature and check it out
@@ -100,14 +100,11 @@ fi
100100

101101
# Create docker container if haven't already
102102
echo " - Success! Running docker container doom-nvim-contrib-container..."
103-
mkdir -p "${SCRIPT_DIR}/local-share-nvim" "${SCRIPT_DIR}/workspace"
104-
echo ""
105103
docker run \
106104
-it \
107105
-e UID="1000" \
108106
-e GID="1000" \
109107
-v "$SCRIPT_DIR"/doom-nvim-contrib:/home/doom/.config/nvim \
110-
-v "$SCRIPT_DIR"/local-share-nvim:/home/doom/.local/share/nvim \
111108
-v "$SCRIPT_DIR"/workspace:/home/doom/workspace \
112109
--name doom-nvim-contrib-container \
113110
--user doom \

0 commit comments

Comments
 (0)