diff options
| author | David T. Sadler <davidtsadler@googlemail.com> | 2021-05-27 20:55:30 +0100 |
|---|---|---|
| committer | David T. Sadler <davidtsadler@googlemail.com> | 2021-05-27 20:55:30 +0100 |
| commit | a616477a70fd0837a2bedee5e863c1ae3db7d2f4 (patch) | |
| tree | b9029dbaea134ebb3b5efc693e7bce5af1a9b37b | |
| parent | ec74a17954f489ccfc1b66bbea4f22b867fa87ce (diff) | |
Tidy up scripts
| -rwxr-xr-x | scripts/build | 3 | ||||
| -rwxr-xr-x | scripts/deploy | 9 | ||||
| -rwxr-xr-x | scripts/deploy_gemini | 5 | ||||
| -rwxr-xr-x | scripts/deploy_www | 5 | ||||
| -rw-r--r-- | scripts/php/build_www_site.php (renamed from scripts/build_www_site.php) | 6 | ||||
| -rw-r--r-- | scripts/php/functions.php (renamed from scripts/functions.php) | 0 |
6 files changed, 18 insertions, 10 deletions
diff --git a/scripts/build b/scripts/build new file mode 100755 index 0000000..dc49028 --- /dev/null +++ b/scripts/build @@ -0,0 +1,3 @@ +#!/bin/sh + +php ~/projects/davidtsadler.com/scripts/php/build_www_site.php diff --git a/scripts/deploy b/scripts/deploy index 2e349e0..b901cdc 100755 --- a/scripts/deploy +++ b/scripts/deploy @@ -1,9 +1,4 @@ #!/bin/sh -rsync -avr --delete \ - ~/projects/davidtsadler.com/gemini/ \ - davidtsadler.com:/home/gemini/sites/davidtsadler.com/public - -rsync -avr --delete \ - ~/projects/davidtsadler.com/www/ \ - davidtsadler.com:/var/www/davidtsadler.com +~/projects/davidtsadler.com/scripts/deploy_gemini +~/projects/davidtsadler.com/scripts/deploy_www diff --git a/scripts/deploy_gemini b/scripts/deploy_gemini new file mode 100755 index 0000000..ccd2d97 --- /dev/null +++ b/scripts/deploy_gemini @@ -0,0 +1,5 @@ +#!/bin/sh + +rsync -avr --delete \ + ~/projects/davidtsadler.com/gemini/ \ + davidtsadler.com:/home/gemini/sites/davidtsadler.com/public diff --git a/scripts/deploy_www b/scripts/deploy_www new file mode 100755 index 0000000..e304742 --- /dev/null +++ b/scripts/deploy_www @@ -0,0 +1,5 @@ +#!/bin/sh + +rsync -avr --delete \ + ~/projects/davidtsadler.com/www/ \ + davidtsadler.com:/var/www/davidtsadler.com diff --git a/scripts/build_www_site.php b/scripts/php/build_www_site.php index f6a5806..2defb92 100644 --- a/scripts/build_www_site.php +++ b/scripts/php/build_www_site.php @@ -4,7 +4,7 @@ require_once __DIR__.DIRECTORY_SEPARATOR.'functions.php'; $hostname = 'davidtsadler.com'; -$geminiSrc = __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'gemini'; +$geminiSrc = __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'gemini'; if (!is_dir($geminiSrc)) { echo "Unable to locate gemini directory.\n\n"; @@ -16,7 +16,7 @@ if (!is_readable($geminiSrc)) { exit(1); } -$output = __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'www'; +$output = __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'www'; if (!is_dir($output)) { echo "Unable to locate output directory.\n\n"; @@ -28,7 +28,7 @@ if (!is_writable($output)) { exit(1); } -$htmlTemplateDiretory = __DIR__.DIRECTORY_SEPARATOR.'../html_templates'; +$htmlTemplateDiretory = __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'html_templates'; if (!is_dir($htmlTemplateDiretory)) { echo "Unable to locate html template directory.\n\n"; diff --git a/scripts/functions.php b/scripts/php/functions.php index 3e8e7a4..3e8e7a4 100644 --- a/scripts/functions.php +++ b/scripts/php/functions.php |