Install path at /opt/ATSAS; CSH and FISH support.

6 files changed, 52 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3135f0c91d3b..3783fc8f1bde 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,9 @@
 pkgbase = atsas
 	pkgdesc = A program suite for small-angle scattering data analysis from biological macromolecules
 	pkgver = 3.0.4
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.embl-hamburg.de/biosaxs/software.html
+	install = install
 	arch = x86_64
 	license = custom
 	depends = libgfortran.so=5
@@ -10,8 +11,12 @@ pkgbase = atsas
 	source = local://ATSAS-3.0.4-2_amd64.tar.gz
 	source = license.md
 	source = atsas.sh
+	source = atsas.fish
+	source = atsas.csh
 	sha512sums = aa82405268efb3f948609d930aac8a43be9c138e25e892b672054cf7cf010be4ed3f10f158c4bc418084f690a261758d9aa32e395d72638d822533a348b430e7
 	sha512sums = 3f728fb538b236f0ddce8a7c86303d14c529da4f117eb5f4c87ef5f0fef52dea3ae7650fc439316c08628dc641893ab10f85890577fcb8e67b9398fdbbfa773f
-	sha512sums = d5cf2dd6ee92a6ce9d01cfd5a2a87f081b4ecceecc7839f78c80d5c9a48c81b44f308e185b98e8d844bad8084d0d4946e4a117989a7b36e14db0d577013aecde
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
 
 pkgname = atsas
diff --git a/PKGBUILD b/PKGBUILD
index 4ac3ead14abe..9a6a13055b45 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,40 @@
 # Maintainer: András Wacha <awacha@gmail.com>
 pkgname=atsas
 pkgver=3.0.4
-pkgrel=1
+pkgrel_upstream=2
+pkgrel=2
 pkgdesc="A program suite for small-angle scattering data analysis from biological macromolecules"
 arch=('x86_64')
 url="https://www.embl-hamburg.de/biosaxs/software.html"
 license=('custom')
 options=('!strip')
 depends=( 'libgfortran.so=5' )
+install=install
 
 # !!! You have to download the sources yourself from https://www.embl-hamburg.de/biosaxs/download.html
 # !!! Use the Ubuntu-20.04 version!
 
-source=('local://ATSAS-3.0.4-2_amd64.tar.gz' 'license.md' 'atsas.sh')
+source=("local://ATSAS-${pkgver}-${pkgrel_upstream}_amd64.tar.gz" 'license.md' 'atsas.sh' 'atsas.fish' 'atsas.csh')
 sha512sums=('aa82405268efb3f948609d930aac8a43be9c138e25e892b672054cf7cf010be4ed3f10f158c4bc418084f690a261758d9aa32e395d72638d822533a348b430e7'
             '3f728fb538b236f0ddce8a7c86303d14c529da4f117eb5f4c87ef5f0fef52dea3ae7650fc439316c08628dc641893ab10f85890577fcb8e67b9398fdbbfa773f'
-            'd5cf2dd6ee92a6ce9d01cfd5a2a87f081b4ecceecc7839f78c80d5c9a48c81b44f308e185b98e8d844bad8084d0d4946e4a117989a7b36e14db0d577013aecde')
+            'SKIP'
+            'SKIP'
+            'SKIP'
+)
 
 
 package() {
+	cd ${srcdir}
 #	set > environment.txt
-	mkdir -p "${pkgdir}/opt"
-	cp -R "${srcdir}/ATSAS-3.0.4-2" "${pkgdir}/opt/atsas"
-	ATSAS_ROOT=/opt/atsas
-#	DEST_BIN_DIR=/opt/atsas/bin
+	ATSAS_ROOT=/opt/ATSAS
+	mkdir -p "${pkgdir}${ATSAS_ROOT}"
+	ln -s ATSAS "${pkgdir}/opt/atsas"
+	cd "${srcdir}/ATSAS-${pkgver}-${pkgrel_upstream}" 
+	cp -R * "${pkgdir}${ATSAS_ROOT}/"
+#	DEST_BIN_DIR="$ATSAS_ROOT/bin"
 #	GCC7_LIBDIR=$(ls -d /usr/lib/gcc/${CHOST}/7.*)
 #	echo "GCC7 libdir: ${GCC7_LIBDIR}"
-#	mkdir -p "${pkgdir}/${DEST_BIN_DIR}"
+#	mkdir -p "${pkgdir}${DEST_BIN_DIR}"
 #	mkdir -p "${pkgdir}${ATSAS_ROOT}/libexec"
 #	for f in ${pkgdir}${ATSAS_ROOT}/bin/*; do
 #		mv $f ${pkgdir}${ATSAS_ROOT}/libexec
@@ -39,12 +47,15 @@ package() {
 #EOF
 #		chmod +x ${pkgdir}${DEST_BIN_DIR}/$f
 #	done
+	cd ${srcdir}
 	mkdir -p "${pkgdir}/usr/share/licenses/${pkgname}"
 	cp "${srcdir}/license.md" "${pkgdir}/usr/share/licenses/${pkgname}"
 	mkdir -p "${pkgdir}/etc/profile.d"
-	cp "${srcdir}/atsas.sh" "${pkgdir}/etc/profile.d/atsas.sh"
-	chmod +x "${pkgdir}/etc/profile.d/atsas.sh"
- 	mv ${pkgdir}/opt/atsas/share/applications ${pkgdir}/usr/share
- 	mv ${pkgdir}/opt/atsas/share/icons ${pkgdir}/usr/share
- 	mv ${pkgdir}/opt/atsas/share/mime ${pkgdir}/usr/share
+	cp "${srcdir}/atsas".{csh,sh} "${pkgdir}/etc/profile.d/"
+	chmod +x "${pkgdir}/etc/profile.d/atsas."{csh,sh}
+ 	mv "${pkgdir}${ATSAS_ROOT}/share/applications" "${pkgdir}/usr/share"
+ 	mv "${pkgdir}${ATSAS_ROOT}/share/icons" "${pkgdir}/usr/share"
+ 	mv "${pkgdir}${ATSAS_ROOT}/share/mime" "${pkgdir}/usr/share"
+	mkdir -p "${pkgdir}/etc/fish/conf.d"
+	cp "${srcdir}/atsas.fish" "${pkgdir}/etc/fish/conf.d/atsas.fish"
 }
diff --git a/atsas.csh b/atsas.csh
new file mode 100644
index 000000000000..a517c50eb601
--- /dev/null
+++ b/atsas.csh
@@ -0,0 +1,3 @@
+setenv ATSAS /opt/ATSAS
+setenv PATH "${ATSAS}/bin:${PATH}"
+
diff --git a/atsas.fish b/atsas.fish
new file mode 100644
index 000000000000..526d927f8cb4
--- /dev/null
+++ b/atsas.fish
@@ -0,0 +1,4 @@
+set ATSAS /opt/ATSAS
+fish_add_path -p $ATSAS/bin
+
+
diff --git a/atsas.sh b/atsas.sh
index ffbf6fb334b0..0ac0f804119a 100644
--- a/atsas.sh
+++ b/atsas.sh
@@ -1 +1,2 @@
-export PATH=/opt/atsas/bin:$PATH
+export ATSAS=/opt/ATSAS
+export PATH=$ATSAS/bin:$PATH
diff --git a/install b/install
new file mode 100644
index 000000000000..856021288de5
--- /dev/null
+++ b/install
@@ -0,0 +1,12 @@
+post_install() {
+	echo "***********************************************************************************"
+	echo "* Please note that ATSAS is now installed under /opt/ATSAS, instead of /opt/atsas *"
+        echo "***********************************************************************************"
+}
+
+post_upgrade() {
+	echo "***********************************************************************************"
+	echo "* Please note that ATSAS is now installed under /opt/ATSAS, instead of /opt/atsas *"
+        echo "***********************************************************************************"
+}
+