Updated install location to conform to Arch web application packaging guidelines.

3 files changed, 38 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e550357f1a21..746afece303c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -12,10 +12,8 @@ pkgbase = organizr-git
 	conflicts = organizr
 	source = organizr-git::git+https://github.com/causefx/Organizr.git#branch=v2-master
 	source = organizr.install
-	source = organizr.tmpfiles
 	sha256sums = SKIP
-	sha256sums = ae58bcf26a81ac31bc73cc01cf41ce8451b4a279032caee51e4a10470f74bb9f
-	sha256sums = 6a496d0eebd685ddb499eb20d6f12e18c825c9e07e27c0ffe04b10b2fc0706e5
+	sha256sums = 0eb1fc73141105b51e6ced331057b2f2661d915878c641893c64cd28b861bc45
 
 pkgname = organizr-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 3358b97f7739..1cfb23179cf2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,10 +12,9 @@ optdepends=('fail2ban')
 provides=('organizr')
 conflicts=('organizr')
 install='organizr.install'
-source=("${pkgname}::git+https://github.com/causefx/Organizr.git#branch=v2-master" "organizr.install" "organizr.tmpfiles")
+source=("${pkgname}::git+https://github.com/causefx/Organizr.git#branch=v2-master" "organizr.install")
 sha256sums=('SKIP'
-            'ae58bcf26a81ac31bc73cc01cf41ce8451b4a279032caee51e4a10470f74bb9f'
-	    '6a496d0eebd685ddb499eb20d6f12e18c825c9e07e27c0ffe04b10b2fc0706e5')
+	    '0eb1fc73141105b51e6ced331057b2f2661d915878c641893c64cd28b861bc45')
 
 pkgver() {
     cd "${pkgname}"
@@ -23,7 +22,14 @@ pkgver() {
 }
 
 package() {
-    install -D -m 644 "${srcdir}/organizr.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/organizr.conf"
-    install -dm 755 "${pkgdir}/opt/${_pkgname}"
-    cp -r "${srcdir}/${pkgname}/"* "${pkgdir}/opt/${_pkgname}/"
+    install -dm 755 "${pkgdir}/usr/share/webapps/${_pkgname}"
+    install -dm 755 "${pkgdir}/var/lib/${_pkgname}"
+    
+    cp -r "${srcdir}/${pkgname}/"* "${pkgdir}/usr/share/webapps/${_pkgname}/"
+    
+    mv "${pkgdir}/usr/share/webapps/${_pkgname}/api" "${pkgdir}/var/lib/${_pkgname}/"
+    ln -s "/var/lib/${_pkgname}/api" "${pkgdir}/usr/share/webapps/${_pkgname}/api"
+    
+    mv "${pkgdir}/usr/share/webapps/${_pkgname}/plugins" "${pkgdir}/var/lib/${_pkgname}/"
+    ln -s "/var/lib/${_pkgname}/plugins" "${pkgdir}/usr/share/webapps/${_pkgname}/plugins"
 }
diff --git a/organizr.install b/organizr.install
index dc3f7ef71c47..04d9359261df 100644
--- a/organizr.install
+++ b/organizr.install
@@ -1,35 +1,48 @@
 post_install() {
-    chown -R http:http /opt/organizr
     chown -R http:http /var/lib/organizr
 
     echo '-------------------------------------------------------------------------------'
     echo 'Once you have added Organizr to your web server configuration, browse to'
     echo '<Your Organizer URL>/check.php to see if you need to enable any PHP extensions.'
     echo
-    echo 'The directory /var/lib/organizr was created to store your Organizr database.'
+    echo 'The directory /var/lib/organizr was created to store your Organizr DB and config.'
     echo 'Specify this directory as the Database Path when visiting the main site for the'
     echo 'first time.'
     echo '-------------------------------------------------------------------------------'
 }
 
 post_upgrade() {
-    chown -R http:http /opt/organizr
     chown -R http:http /var/lib/organizr
 
-    if [[ -d /usr/share/webapps/organizr ]] && [[ ! -e /opt/organizr/api/config/config.php ]]; then
+    if [[ -e /opt/organizr/api/config/config.php ]]; then
 	echo '-------------------------------------------------------------------------------'
-	echo 'NOTE: Organizr has been moved to /opt/organizr. An old installation in'
-	echo '/usr/share/webapps/organizr has been detected.  Use the following command to'
-	echo 'move your configuration to the new location:'
-	echo '  sudo mv /usr/share/webapps/organizr/Organizr/api/config/config.php /opt/organizr/api/config'
+	echo 'NOTE: Organizr has been moved (AGAIN!) to /usr/share/webapps/organizr'
+	echo '(read-only data) and /var/lib/organizr (read-write storage). An old installation'
+	echo 'in /opt/organizr has been detected.  Use the following command to move your'
+	echo 'configuration to the new location:'
+	echo '  sudo mv /opt/organizr/api/config/config.php /var/lib/organizr/api/config'
 	echo
 	echo 'If you installed any custom tab images, move those with:'
-	echo '  sudo mv /usr/share/webapps/organizr/Organizr/plugins/images/tabs/* /opt/organizr/plugins/images/tabs'
+	echo '  sudo mv /opt/organizr/plugins/images/tabs/* /var/lib/organizr/plugins/images/tabs'
 	echo
 	echo 'Please adjust the paths in your webserver and PHP configs to reflect the new'
-	echo 'location.  Note that previously files were installed to /usr/share/webapps/organizr/Organizr.'
-	echo 'The extra Organizr subdirectory has been eliminated and the package is installed directly'
-	echo 'to /opt/organizr.'
+	echo 'location in /usr/share/webapps/organizr.  You may also need to add /var/lib/organizr'
+	echo 'to your PHP config.'
+	echo '-------------------------------------------------------------------------------'
+    elif [[ -e /usr/share/webapps/organizr/Organizr/api/config/config.php ]]; then
+	echo '-------------------------------------------------------------------------------'
+	echo 'NOTE: The Organizr config and plugins have been moved to /var/lib/organizr.'
+	echo 'In addition, the remaining installation has moved from /usr/share/webapps/organizr/Organizr'
+	echo 'to /usr/share/webapps/organizr.  An old installation in /usr/share/webapps/organizr/Organizr'
+	echo 'has been detected.  Use the following command to move your configuration to the new location:'
+	echo '  sudo mv /usr/share/webapps/organizr/Organizr/api/config/config.php /var/lib/organizr/api/config'
+	echo
+	echo 'If you installed any custom tab images, move those with:'
+	echo '  sudo mv /usr/share/webapps/organizr/Organizr/plugins/images/tabs/* /var/lib/organizr/plugins/images/tabs'
+	echo
+	echo 'Please adjust the paths in your webserver and PHP configs to reflect the new'
+	echo 'location in /usr/share/webapps/organizr.  You may also need to add /var/lib/organizr'
+	echo 'to your PHP config.'
 	echo '-------------------------------------------------------------------------------'
     fi
 }