Updated how config file is handled and post install instructions

3 files changed, 24 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4c54e8c1fc8a..f39765ebb47d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gsplus-git
 	pkgdesc = Modern cross-platform Apple IIgs emulator
 	pkgver = r79.74815bf
-	pkgrel = 1
+	pkgrel = 2
 	url = http://apple2.gs/plus/
 	install = gsplus.install
 	arch = x86_64
@@ -10,7 +10,7 @@ pkgbase = gsplus-git
 	depends = libpcap
 	depends = libx11
 	depends = libxext
-	depends = alsa-oss
+	optdepends = alsa-oss
 	provides = gsplus
 	conflicts = gsplus
 	source = git+https://github.com/digarok/gsplus
@@ -21,7 +21,7 @@ pkgbase = gsplus-git
 	sha256sums = SKIP
 	sha256sums = d332c858a9517a9adc6f581718e9c5288ee83a0a93a872414cfda8776a2a38ae
 	sha256sums = 143c61dc91a0cd9cf79e4548d0eee97d04f5396967c660fc843f3c7cf543ba0e
-	sha256sums = 15ad6049dfdc539c3fd6f1069ca7fb0f638a2c7c6158c17d2c590cd7d9290fb2
+	sha256sums = b49a30685334485d0d6fea480a90c36c6d5ed2821bfe90490ed5bb971fe6735a
 	sha256sums = 5edb3a7b2083fabcf0c301f9761774b0aaf3ee03ef2e7a03f25c8f8226a1717b
 
 pkgname = gsplus-git
diff --git a/PKGBUILD b/PKGBUILD
index 89bae7e3578f..844ffcc8a394 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,14 +2,15 @@
 pkgname=gsplus-git
 _name=gsplus
 pkgver=r79.74815bf
-pkgrel=1
+pkgrel=2
 pkgdesc="Modern cross-platform Apple IIgs emulator"
 arch=('x86_64')
 url="http://apple2.gs/plus/"
 license=('GPL')
 provides=('gsplus')
 conflicts=('gsplus')
-depends=('git' 'libpcap' 'libx11' 'libxext' 'alsa-oss')
+depends=('git' 'libpcap' 'libx11' 'libxext')
+optdepends=('alsa-oss')
 install=$_name.install
 source=("git+https://github.com/digarok/gsplus"
         "gsplus.png"
@@ -19,7 +20,7 @@ source=("git+https://github.com/digarok/gsplus"
 sha256sums=("SKIP"
             "d332c858a9517a9adc6f581718e9c5288ee83a0a93a872414cfda8776a2a38ae"
             "143c61dc91a0cd9cf79e4548d0eee97d04f5396967c660fc843f3c7cf543ba0e"
-            "15ad6049dfdc539c3fd6f1069ca7fb0f638a2c7c6158c17d2c590cd7d9290fb2"
+            "b49a30685334485d0d6fea480a90c36c6d5ed2821bfe90490ed5bb971fe6735a"
             "5edb3a7b2083fabcf0c301f9761774b0aaf3ee03ef2e7a03f25c8f8226a1717b")
 
 pkgver() {
@@ -54,17 +55,16 @@ package() {
         # Creating directories for pkgbuild
         mkdir -pm 755 "$pkgdir"/usr/share/$_name
         mkdir -pm 755 "$pkgdir"/usr/bin
-        mkdir -pm 755 "$pkgdir"/etc/$_name
+	mkdir -pm 755 "$pkgdir"/usr/share/$_name/docs
+	mkdir -pm 755 "$pkgdir"/usr/share/$_name/images
         
-        # Install config file in /etc/gsplus
-        install -m 777 "$srcdir"/$_name/config.template "$pkgdir"/etc/$_name/config.txt
-        # Link to config file in /usr/share program needs this to start
-        ln -s /etc/gsplus/config.txt "$pkgdir"/usr/share/$_name/config.txt
+        # Install config file in /etc/gsplus - NOT NEEDED
+	# install -m 755 "$srcdir"/$_name/config.template "$pkgdir"/usr/share/$_name/config.txt
 
 	install -m 755 "$srcdir"/$_name/gsplusx "$pkgdir"/usr/share/$_name/gsplusx 
 	ln -s /usr/share/gsplus/gsplusx $pkgdir/usr/bin/gsplus
-	install -m 755 "$srcdir"/README.txt "$pkgdir"/usr/share/$_name/README.txt
-	install -m 755 "$srcdir"/gsplusmanual.txt "$pkgdir"/usr/share/$_name/gsplusmanual.txt
+	install -m 755 "$srcdir"/README.txt "$pkgdir"/usr/share/$_name/docs/README.txt
+	install -m 755 "$srcdir"/gsplusmanual.txt "$pkgdir"/usr/share/$_name/docs/gsplusmanual.txt
 
 	#msg2 "Install desktop application entry in /usr/share/applications..."
 	install -Dm644 "$srcdir"/$_name.desktop "$pkgdir"/usr/share/applications/$_name.desktop
diff --git a/gsplus.install b/gsplus.install
index 024ddfa88fe7..b258bff83d28 100644
--- a/gsplus.install
+++ b/gsplus.install
@@ -1,16 +1,18 @@
  
 post_install() {
 
-  echo "$(tput setaf 6)You can make changes to the application configuration at /etc/gsplus/config.txt$(tput sgr0)"
   echo "$(tput setaf 6)You can start the application from the graphical menu or by typing gsplus in the terminal$(tput sgr0)"
-  echo "$(tput setaf 6)Please review /usr/share/gsplus/README.txt as additional configuration is required$(tput sgr0)"
-  echo "$(tput setaf 6)to get the application to run.  You will have to place some files in /usr/share/gsplus/$(tput sgr0)"
-  echo "$(tput setaf 6)In addition to get sound to work you will have to run the following:$(tput sgr0)"
-  echo "$(tput setaf 6)modprobe snd-seq-oss && modprobe snd-pcm-oss && modprobe snd-mixer-oss$(tput sgr0)"
+  echo "$(tput setaf 6)If you run from the menu the config.txt will be created in your home directory$(tput sgr0)"
+  echo "$(tput setaf 6)If you run from the terminal the config.txt will be created in your current directory$(tput sgr0)"
   echo "$(tput setaf 6) $(tput sgr0)"
-  echo "$(tput setaf 1)!!! Be aware the /etc/gsplus/config.txt file has 777 permission! The application      !!!$(tput sgr0)"
-  echo "$(tput setaf 1)!!! will not run without the config file being writable.                              !!!$(tput sgr0)"
-  echo "$(tput setaf 1)!!! I am quite sure this is a poor security practice so install and use this          !!!$(tput sgr0)"
-  echo "$(tput setaf 1)!!! application at your own risk!                                                     !!!$(tput sgr0)"
+  echo "$(tput setaf 2)Please review /usr/share/gsplus/docs/README.txt as additional configuration is required$(tput sgr0)"
+  echo "$(tput setaf 2)to get the application to run$(tput sgr0)"
+  echo "$(tput setaf 2)You will need a ROM file and disk images to use gsplus$(tput sgr0)"
+  echo "$(tput setaf 2)Again, please read the included documentation to configure the application or it won't run!$(tput sgr0)"
+  echo "$(tput setaf 2) $(tput sgr0)"
+  echo "$(tput setaf 4)In addition to get sound to work you will have to install the optional package alsa-oss$(tput sgr0)"
+  echo "$(tput setaf 4)run the following after each reboot:$(tput sgr0)"
+  echo "$(tput setaf 4)modprobe snd-seq-oss && modprobe snd-pcm-oss && modprobe snd-mixer-oss$(tput sgr0)"
+  echo "$(tput setaf 4) $(tput sgr0)"
   
 }