Install Phoenix Cart from GitHEADmaster

6 files changed, 14 insertions, 19 deletions

diff --git a/README.md b/README.md
index ebb2051..c67c9a3 100644
--- a/README.md
+++ b/README.md
@@ -37,12 +37,3 @@ Shell:       /usr/local/libexec/gitolite/gitolite-shell
 $ doas -u git /bin/sh
 $ gitolite setup -pk bookcorner.pub
 ```
-
-
-
-Phoenix Cart
-------------
-
-Extract https://github.com/CE-PhoenixCart/PhoenixCart/archive/refs/tags/v1.1.0.7.zip
-to `/var/www/htdocs`
-(SHA256: `5bb59df44cac040a7b5218824da76c12b8ba44f9d56e792ac49cac16a6814a1e`).
diff --git a/deploy b/deploy
index f17d7c2..eb4a718 100755
--- a/deploy
+++ b/deploy
@@ -52,6 +52,10 @@ fi
 
 if [ "$DRY" != 'YES' ]; then
     echo '==='
+    echo 'Installing Phoenix Cart'
+    git --git-dir /home/git/repositories/phoenixcart.git archive master | tar -x -f - -C /var/www/htdocs/phoenixcart
+
+    echo '==='
     echo 'Apply packet filter rules'
     pfctl -f /etc/pf.conf && echo 'OK' || echo 'FAIL'
 
diff --git a/etc/httpd.conf b/etc/httpd.conf
index fd03bea..f39c8a7 100644
--- a/etc/httpd.conf
+++ b/etc/httpd.conf
@@ -16,7 +16,7 @@ server "bookcorner.ge" {
 	include "/etc/httpd/_listen443.conf"
 	include "/etc/httpd/_acme.conf"
 
-	root "/htdocs/PhoenixCart-1.1.0.7"
+	root "/htdocs/phoenixcart"
 	directory index "index.php"
 
 	location "*.php" {
diff --git a/files.sh b/files.sh
index 0eb2342..33bcea2 100644
--- a/files.sh
+++ b/files.sh
@@ -31,8 +31,8 @@ install_dir  0755 root daemon  '/var/www/conf'
 install_file 0644 root wheel   '/var/www/conf/cgitrc'
 install_dir  0755 git  git     '/var/www/git'
 install_dir  0755 git  git     '/var/www/git/repositories'
-install_dir  0755 root wheel   '/var/www/htdocs/PhoenixCart-1.1.0.7'
-install_dir  0755 root wheel   '/var/www/htdocs/PhoenixCart-1.1.0.7/includes'
-install_dir  0755 root wheel   '/var/www/htdocs/PhoenixCart-1.1.0.7/admin/includes'
-install_file 0644 root wheel   '/var/www/htdocs/PhoenixCart-1.1.0.7/includes/configure.php'
-install_file 0644 root wheel   '/var/www/htdocs/PhoenixCart-1.1.0.7/admin/includes/configure.php'
+install_dir  0755 root wheel   '/var/www/htdocs/phoenixcart'
+install_dir  0755 root wheel   '/var/www/htdocs/phoenixcart/includes'
+install_dir  0755 root wheel   '/var/www/htdocs/phoenixcart/admin/includes'
+install_file 0644 root wheel   '/var/www/htdocs/phoenixcart/includes/configure.php'
+install_file 0644 root wheel   '/var/www/htdocs/phoenixcart/admin/includes/configure.php'
diff --git a/var/www/htdocs/PhoenixCart-1.1.0.7/admin/includes/configure.php b/var/www/htdocs/phoenixcart/admin/includes/configure.php
index 76c0e07..80d145b 100644
--- a/var/www/htdocs/PhoenixCart-1.1.0.7/admin/includes/configure.php
+++ b/var/www/htdocs/phoenixcart/admin/includes/configure.php
@@ -16,10 +16,10 @@
 
   date_default_timezone_set('Asia/Tbilisi');
 
-  const DIR_FS_CATALOG = '/htdocs/PhoenixCart-1.1.0.7/';
+  const DIR_FS_CATALOG = '/htdocs/phoenixcart/';
 
-  const DIR_FS_DOCUMENT_ROOT = '/htdocs/PhoenixCart-1.1.0.7/';
-  const DIR_FS_ADMIN = '/htdocs/PhoenixCart-1.1.0.7/admin/';
+  const DIR_FS_DOCUMENT_ROOT = '/htdocs/phoenixcart/';
+  const DIR_FS_ADMIN = '/htdocs/phoenixcart/admin/';
   const DIR_FS_BACKUP = DIR_FS_ADMIN . 'backups/';
 
 // If you are asked to provide configure.php details,
diff --git a/var/www/htdocs/PhoenixCart-1.1.0.7/includes/configure.php b/var/www/htdocs/phoenixcart/includes/configure.php
index 781e5b6..32a0408 100644
--- a/var/www/htdocs/PhoenixCart-1.1.0.7/includes/configure.php
+++ b/var/www/htdocs/phoenixcart/includes/configure.php
@@ -15,7 +15,7 @@
 
 // If you are asked to provide configure.php details,
 // please remove the data below before sharing.
-  const DIR_FS_CATALOG = '/htdocs/PhoenixCart-1.1.0.7/';
+  const DIR_FS_CATALOG = '/htdocs/phoenixcart/';
 
   const DB_SERVER = '127.0.0.1';
   const DB_SERVER_USERNAME = 'phoenixcart';