push and pull kinda

bpmct · bpmct · commit a8ceb53df1bd · 2021-03-04T02:22:17.000-05:00
diff --git a/README.md b/README.md
@@ -31,16 +31,26 @@ $ cat $(rclone config file | sed -n 2p) | base64 --b 0 # MacOS
 
 Now, you can add the following the environment variables in the code-server cloud app:
 
-| Environment Variable | Description                                                                                                                                           | Default Value                             | Required |
-| -------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------- | -------- |
-| RCLONE_DATA          | the encoded rclone config you copied in step 3                                                                                                        | n/a                                       | ✅       |
-| RCLONE_REMOTE_NAME   | the name of the remote you added in step 2.<br />check with `$ rclone listremotes`                                                                    | code-server-remote                        |          |
-| RCLONE_SOURCE        | source directory to sync files in the code-server container                                                                                           | the entire home directory: `/home/coder/` |          |
-| RCLONE_DESTINATION   | the path in the remote that rclone syncs to. change this if you have multiple code-server environments, or if you want to better organize your files. | code-server-files                         |          |
+| Environment Variable | Description                                                                                                                                           | Default Value                                | Required |
+| -------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------- | -------- |
+| RCLONE_DATA          | the encoded rclone config you copied in step 3                                                                                                        | n/a                                          | ✅       |
+| RCLONE_REMOTE_NAME   | the name of the remote you added in step 2.<br />check with `$ rclone listremotes`                                                                    | code-server-remote                           |          |
+| RCLONE_SOURCE        | source directory to sync files in the code-server container                                                                                           | the project directory: `/home/coder/project` |          |
+| RCLONE_DESTINATION   | the path in the remote that rclone syncs to. change this if you have multiple code-server environments, or if you want to better organize your files. | code-server-files                            |          |
+
+```sh
+
+# How to use:
+
+$ sh /home/coder/push-remote.sh # save your uncomitted files to the remote
+
+$ sh /home/coder/pull-remote.sh # get latest files from the remote
+```
 
 ---
 
 ## Todo:
 
+- [ ] Impliment file watcher or auto file sync in VS Code
 - [ ] Add support for SSH / VS Code remote access
 - [ ] Make rclone logs visible in environment for debugging
diff --git a/railway-entrypoint.sh b/railway-entrypoint.sh
@@ -3,23 +3,36 @@
 # Allow user to aupply a start dir, default to /home/coder/project
 START_DIR=${1:-/home/coder/project}
 
-# Clone the git repo, if it exists
-[ -z "${GIT_REPO}" ] && echo "No GIT_REPO specified"; git clone $GIT_REPO $START_DIR
-
 # add rclone config and start rclone, if supplied
 if [[ -z "${RCLONE_DATA}" ]]; then
     echo "RCLONE_DATA is not specified. Files will not persist"
+
+    # Clone the git repo, if it exists
+    [ -z "${GIT_REPO}" ] && echo "No GIT_REPO specified"; git clone $GIT_REPO $START_DIR
+
 else
     echo "Copying rclone config..."
     mkdir -p /home/coder/.config/rclone/
     touch /home/coder/.config/rclone/rclone.conf
     echo $RCLONE_DATA | base64 -d > /home/coder/.config/rclone/rclone.conf
 
-    echo "Syncing files..."
+    # Full path to the remote filesystem
+    RCLONE_REMOTE_PATH=${RCLONE_REMOTE_NAME:-code-server-remote}:${RCLONE_DESTINATION:-code-server-files}
+    RCLONE_SOURCE_PATH=${RCLONE_SOURCE:-$START_DIR}
+    echo "rclone sync $RCLONE_SOURCE_PATH $RCLONE_REMOTE_PATH -vv" > /home/coder/push_remote.sh
+    echo "rclone sync $RCLONE_REMOTE_PATH $RCLONE_SOURCE_PATH -vv" > /home/coder/pull_remote.sh
+
+    if rclone ls $RCLONE_REMOTE_PATH | grep -q 'directory not found'; then
+        # we need to clone the git repo and sync
+        echo "Pushing initial files to remote..."
+        [ -z "${GIT_REPO}" ] && echo "No GIT_REPO specified" && mkdir -p $START_DIR && echo "intial file" > $START_DIR/file.txt; git clone $GIT_REPO $START_DIR
+        /home/coder/push_remote.sh&
+    else
+        echo "Pulling files from remote..."
+        # grab the files from the remote instead
+        /home/coder/pull_remote.sh&
+    fi
 
-    touch /home/coder/sync_remote.sh && chmod +x /home/coder/sync_remote.sh
-    echo "rclone sync ${RCLONE_SOURCE:-"/home/coder/"} ${RCLONE_REMOTE_NAME:-code-server-remote}:${RCLONE_DESTINATION:-code-server-files} -vv" > /home/coder/sync_remote.sh
-    /home/coder/sync_remote.sh&
 fi
 
 # Now we can run code-server with the default entrypoint
