diff --git a/local.yml b/local.yml index 2bef041ba9e032a17af9fcfc66c2a66723e8a791..c7bd148140f65d178c698eea673be2f5ce6b9bae 100644 --- a/local.yml +++ b/local.yml @@ -27,7 +27,7 @@ - python3-venv roles: - - git-clone-or-pull + - git-clone - jupyter-lab - ml-python-packages - misc-applications diff --git a/roles/git-clone-or-pull/tasks/main.yml b/roles/git-clone-or-pull/tasks/main.yml deleted file mode 100644 index ddf1e73f94d9d812ae7caddf584375e28f051222..0000000000000000000000000000000000000000 --- a/roles/git-clone-or-pull/tasks/main.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# roles/git-clone-or-pull - -- name: Copy clone-or-pull script to remote fs - copy: - mode: u=rwx,g=rx,o=rx - src: files/clone-or-pull.sh - dest: /tmp/clone-or-pull.sh - -- name: - become: true - become_user: "{{ target_user }}" - shell: "bash /tmp/clone-or-pull.sh" \ No newline at end of file diff --git a/roles/git-clone-or-pull/files/clone-or-pull.sh b/roles/git-clone/files/clone.sh similarity index 73% rename from roles/git-clone-or-pull/files/clone-or-pull.sh rename to roles/git-clone/files/clone.sh index 19052a75a00c5b4d33d18c80e8c227e5fbc8b3a2..fe7deace05e5389780563c0323b24e44be40e9ed 100755 --- a/roles/git-clone-or-pull/files/clone-or-pull.sh +++ b/roles/git-clone/files/clone.sh @@ -7,10 +7,9 @@ CLONE_DIRECTORY="$HOME/notebooks" mkdir -p $CLONE_DIRECTORY cd $CLONE_DIRECTORY if test -d "$DIRECTORY_NAME"; then - # directory already exists. Just pull to update - cd $DIRECTORY_NAME - git pull + # directory already exists. + exit else # directory does not exist. Clone the repo - git clone $GIT_URL + git clone $GIT_URL $DIRECTORY_NAME fi \ No newline at end of file diff --git a/roles/git-clone/tasks/main.yml b/roles/git-clone/tasks/main.yml new file mode 100644 index 0000000000000000000000000000000000000000..a800219434c5cde9da01c91b106ef8b0dfcb939c --- /dev/null +++ b/roles/git-clone/tasks/main.yml @@ -0,0 +1,13 @@ +--- +# roles/git-clone-or-pull + +- name: Copy clone script to remote fs + copy: + mode: u=rwx,g=rx,o=rx + src: files/clone.sh + dest: /tmp/clone.sh + +- name: + become: true + become_user: "{{ target_user }}" + shell: "bash /tmp/clone.sh" \ No newline at end of file