From 2935dabcfc596081e4398aebb07ab33cc73a1072 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Tue, 10 Aug 2021 22:11:29 +0200 Subject: [PATCH] change directory structure slightly --- Jenkinsfile | 10 ++-------- {actaddmanual => main/actaddmanual}/index.html | 0 {actaddmanual => main/actaddmanual}/index.js | 0 {actaddmanual => main/actaddmanual}/style.css | 0 {commissions => main/commissions}/closed.js | 0 {commissions => main/commissions}/closed.txt | 0 {commissions => main/commissions}/index.html | 0 .../commissions}/media/craftable-deeds.png | Bin .../commissions}/media/enchantment-storage.png | Bin .../commissions}/media/more-flower-bushes.png | Bin .../commissions}/media/natures-starlight.png | Bin {commissions => main/commissions}/media/nyx.png | Bin .../commissions}/media/slingshot.png | Bin {commissions => main/commissions}/mods.js | 0 {commissions => main/commissions}/style.css | 0 15 files changed, 2 insertions(+), 8 deletions(-) rename {actaddmanual => main/actaddmanual}/index.html (100%) rename {actaddmanual => main/actaddmanual}/index.js (100%) rename {actaddmanual => main/actaddmanual}/style.css (100%) rename {commissions => main/commissions}/closed.js (100%) rename {commissions => main/commissions}/closed.txt (100%) rename {commissions => main/commissions}/index.html (100%) rename {commissions => main/commissions}/media/craftable-deeds.png (100%) rename {commissions => main/commissions}/media/enchantment-storage.png (100%) rename {commissions => main/commissions}/media/more-flower-bushes.png (100%) rename {commissions => main/commissions}/media/natures-starlight.png (100%) rename {commissions => main/commissions}/media/nyx.png (100%) rename {commissions => main/commissions}/media/slingshot.png (100%) rename {commissions => main/commissions}/mods.js (100%) rename {commissions => main/commissions}/style.css (100%) diff --git a/Jenkinsfile b/Jenkinsfile index e73518a..c5d2ecb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,15 +16,9 @@ pipeline { branch 'master' } steps { - sh "rm -rf ${env.DEST}/*" - - sh "cp -r main/_site/. ${env.DEST}" - sh "cp -r actaddmanual ${env.DEST}" - sh "cp -r commissions ${env.DEST}" + sh "rm -rf /var/www/ellpeck/*" + sh "cp -r main/_site/. /var/www/ellpeck" } } } - environment { - DEST = "/var/www/ellpeck" - } } \ No newline at end of file diff --git a/actaddmanual/index.html b/main/actaddmanual/index.html similarity index 100% rename from actaddmanual/index.html rename to main/actaddmanual/index.html diff --git a/actaddmanual/index.js b/main/actaddmanual/index.js similarity index 100% rename from actaddmanual/index.js rename to main/actaddmanual/index.js diff --git a/actaddmanual/style.css b/main/actaddmanual/style.css similarity index 100% rename from actaddmanual/style.css rename to main/actaddmanual/style.css diff --git a/commissions/closed.js b/main/commissions/closed.js similarity index 100% rename from commissions/closed.js rename to main/commissions/closed.js diff --git a/commissions/closed.txt b/main/commissions/closed.txt similarity index 100% rename from commissions/closed.txt rename to main/commissions/closed.txt diff --git a/commissions/index.html b/main/commissions/index.html similarity index 100% rename from commissions/index.html rename to main/commissions/index.html diff --git a/commissions/media/craftable-deeds.png b/main/commissions/media/craftable-deeds.png similarity index 100% rename from commissions/media/craftable-deeds.png rename to main/commissions/media/craftable-deeds.png diff --git a/commissions/media/enchantment-storage.png b/main/commissions/media/enchantment-storage.png similarity index 100% rename from commissions/media/enchantment-storage.png rename to main/commissions/media/enchantment-storage.png diff --git a/commissions/media/more-flower-bushes.png b/main/commissions/media/more-flower-bushes.png similarity index 100% rename from commissions/media/more-flower-bushes.png rename to main/commissions/media/more-flower-bushes.png diff --git a/commissions/media/natures-starlight.png b/main/commissions/media/natures-starlight.png similarity index 100% rename from commissions/media/natures-starlight.png rename to main/commissions/media/natures-starlight.png diff --git a/commissions/media/nyx.png b/main/commissions/media/nyx.png similarity index 100% rename from commissions/media/nyx.png rename to main/commissions/media/nyx.png diff --git a/commissions/media/slingshot.png b/main/commissions/media/slingshot.png similarity index 100% rename from commissions/media/slingshot.png rename to main/commissions/media/slingshot.png diff --git a/commissions/mods.js b/main/commissions/mods.js similarity index 100% rename from commissions/mods.js rename to main/commissions/mods.js diff --git a/commissions/style.css b/main/commissions/style.css similarity index 100% rename from commissions/style.css rename to main/commissions/style.css