From ae94c53679ff73d00910bb5f318d5ec152ad8f72 Mon Sep 17 00:00:00 2001
From: Tobias Stein <Tobias.Stein@stud.h-da.de>
Date: Tue, 18 Jan 2022 10:20:08 +0100
Subject: [PATCH] Removed pull from git script to avoid pull conflicts
---
local.yml | 2 +-
roles/git-clone-or-pull/tasks/main.yml | 13 -------------
.../clone-or-pull.sh => git-clone/files/clone.sh} | 7 +++----
roles/git-clone/tasks/main.yml | 13 +++++++++++++
4 files changed, 17 insertions(+), 18 deletions(-)
delete mode 100644 roles/git-clone-or-pull/tasks/main.yml
rename roles/{git-clone-or-pull/files/clone-or-pull.sh => git-clone/files/clone.sh} (73%)
create mode 100644 roles/git-clone/tasks/main.yml
diff --git a/local.yml b/local.yml
index 2bef041..c7bd148 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 ddf1e73..0000000
--- 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 19052a7..fe7deac 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 0000000..a800219
--- /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
--
GitLab