1 files changed, 25 insertions, 2 deletions

diff --git a/cmd/ship/remove.go b/cmd/ship/remove.go
index 922eb8f..8380e87 100644
--- a/cmd/ship/remove.go
+++ b/cmd/ship/remove.go
@@ -46,7 +46,8 @@ func runRemove(cmd *cobra.Command, args []string) error {
         }
         defer client.Close()
 
-        if app.Type == "app" {
+        switch app.Type {
+        case "app":
                 fmt.Println("-> Stopping service...")
                 client.RunSudo(fmt.Sprintf("systemctl stop %s", name))
                 client.RunSudo(fmt.Sprintf("systemctl disable %s", name))
@@ -58,7 +59,29 @@ func runRemove(cmd *cobra.Command, args []string) error {
                 client.RunSudo(fmt.Sprintf("rm -rf /var/lib/%s", name))
                 client.RunSudo(fmt.Sprintf("rm -f /etc/ship/env/%s.env", name))
                 client.RunSudo(fmt.Sprintf("userdel %s", name))
-        } else {
+
+        case "git-app":
+                fmt.Println("-> Stopping service...")
+                client.RunSudo(fmt.Sprintf("systemctl stop %s", name))
+                client.RunSudo(fmt.Sprintf("systemctl disable %s", name))
+
+                client.RunSudo(fmt.Sprintf("rm -f /etc/systemd/system/%s.service", name))
+                client.RunSudo("systemctl daemon-reload")
+
+                fmt.Println("-> Removing Docker image...")
+                client.RunSudo(fmt.Sprintf("docker rmi %s:latest", name))
+
+                fmt.Println("-> Removing files...")
+                client.RunSudo(fmt.Sprintf("rm -rf /var/lib/%s", name))
+                client.RunSudo(fmt.Sprintf("rm -rf /srv/git/%s.git", name))
+                client.RunSudo(fmt.Sprintf("rm -f /etc/ship/env/%s.env", name))
+
+        case "git-static":
+                fmt.Println("-> Removing files...")
+                client.RunSudo(fmt.Sprintf("rm -rf /var/www/%s", name))
+                client.RunSudo(fmt.Sprintf("rm -rf /srv/git/%s.git", name))
+
+        default: // "static"
                 fmt.Println("-> Removing files...")
                 client.RunSudo(fmt.Sprintf("rm -rf /var/www/%s", name))
         }