clean up dependency list

3 files changed, 69 insertions, 88 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1197d88210ec..03f0052a1dd8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,52 +1,16 @@
 pkgbase = bbb-recorder-git
 	pkgdesc = Tool to download recordings from Big Blue Button
 	pkgver = 0.0.0+81
-	pkgrel = 1
+	pkgrel = 2
 	url = git+https://github.com/jibon57/bbb-recorder
 	install = bbb-recorder.install
 	arch = any
 	license = MIT
 	makedepends = git
 	makedepends = npm
-	depends = alsa-lib
-	depends = atk
-	depends = glibc
-	depends = cairo
-	depends = libcups
-	depends = dbus
-	depends = expat
-	depends = fontconfig
-	depends = gcc-libs
-	depends = gconf
-	depends = gdk-pixbuf2
-	depends = glib2
-	depends = gtk3
-	depends = nspr
-	depends = pango
-	depends = gcc
-	depends = libx11
-	depends = libxcb
-	depends = libxcomposite
-	depends = libxcursor
-	depends = libxdamage
-	depends = libxext
-	depends = libxfixes
-	depends = libxi
-	depends = libxrandr
-	depends = libxrender
-	depends = libxss
-	depends = libxtst
-	depends = ca-certificates
-	depends = nss
-	depends = xdg-utils
-	depends = wget
 	depends = xorg-server-xvfb
 	depends = nodejs
 	depends = chromium
-	optdepends = ttf-liberation: possibly required
-	optdepends = libappindicator-gtk3: possibly required
-	optdepends = lsb-release: possibly required
-	optdepends = fonts-noto: possibly required
 	optdepends = ffmpeg: converting webm to mp4
 	source = git+https://github.com/jibon57/bbb-recorder.git
 	sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 19ac48e84d09..3405ac1a4e0c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,58 +4,59 @@
 
 pkgname="bbb-recorder-git"
 pkgver=0.0.0+81
-pkgrel=1
+pkgrel=2
 pkgdesc="Tool to download recordings from Big Blue Button"
 arch=("any")
 url="git+https://github.com/jibon57/bbb-recorder"
 license=("MIT")
 # 1:1 list of the debian packages in ./dependencies_check.sh.
-depends=('alsa-lib'
-         'atk'
-         'glibc'
-         'cairo'
-         'libcups'
-         'dbus'
-         'expat'
-         'fontconfig'
-         'gcc-libs'
-         'gconf'
-         'gdk-pixbuf2'
-         'glib2'
-         'gtk3'
-         'nspr'
-         'pango'
-         'gcc'
-         'libx11'
-         'libxcb'
-         'libxcomposite'
-         'libxcursor'
-         'libxdamage'
-         'libxext'
-         'libxfixes'
-         'libxi'
-         'libxrandr'
-         'libxrender'
-         'libxss'
-         'libxtst'
-         'ca-certificates'
-         'nss'
-         'xdg-utils'
-         'wget'
-         'xorg-server-xvfb')
-# Also part of the list, I SUPPOSE they MAY be optional.
-optdepends=('ttf-liberation: possibly required'
-            'libappindicator-gtk3: possibly required'
-            'lsb-release: possibly required'
-            'fonts-noto: possibly required')
+# But it looks more like the dependencies of chromium.
+depends=( # 'alsa-lib'
+          # 'atk'
+          # 'glibc'
+          # 'cairo'
+          # 'libcups'
+          # 'dbus'
+          # 'expat'
+          # 'fontconfig'
+          # 'gcc-libs'
+          # 'gconf'
+          # 'gdk-pixbuf2'
+          # 'glib2'
+          # 'gtk3'
+          # 'nspr'
+          # 'pango'
+          # 'gcc'
+          #'libx11'
+          #'libxcb'
+          #'libxcomposite'
+          #'libxcursor'
+          #'libxdamage'
+          #'libxext'
+          #'libxfixes'
+          #'libxi'
+          #'libxrandr'
+          #'libxrender'
+          #'libxss'
+          #'libxtst'
+          # 'ca-certificates'
+          # 'libappindicator-gtk3'
+          # 'ttf-liberation'
+          # 'nss'
+          # 'lsb-release'
+          # 'xdg-utils'
+          # 'wget'
+          'xorg-server-xvfb'
+          # 'fonts-noto'
+          )
 # Dependencies mentioned elsewhere:
 depends+=('nodejs')
-optdepends+=('ffmpeg: converting webm to mp4')
-makedepends=('git' 'npm')
 # Because it uses a hardcoded path (can be changed, see prepare function):
 depends+=('chromium')
+optdepends+=('ffmpeg: converting webm to mp4')
+makedepends=('git' 'npm')
 install=bbb-recorder.install
-source=(git+https://github.com/jibon57/bbb-recorder.git)
+source=("git+https://github.com/jibon57/bbb-recorder.git")
 sha256sums=('SKIP')
 
 pkgver() {
@@ -78,7 +79,7 @@ prepare() {
 [[ \$# -lt 1 || \$# -gt 4 ]] && help=1
 [ ! -d ~/Downloads ] && echo "Directory ~/Downloads not found!" && help=1
 [ ! -f /opt/bbb-recorder/.env ] && echo "Configuration file /opt/bbb-recorder/.env was not created. See /opt/bbb-recorder/.env.example" && help=1
-if grep -s copyToPath /opt/bbb-recorder/.env | grep --quiet ~/Downloads$; then echo "The copyToPath cannot be you Downloads directory, because the video is temporarily stored there and later deleted!" && help=1; fi
+grep -s copyToPath /opt/bbb-recorder/.env | grep --quiet ~/Downloads$ && echo "The copyToPath cannot be you Downloads directory, because the video is temporarily stored there and later deleted!" && help=1
 [[ \$2 == */* ]] &&  echo "The filename cannot be a path!" && help=1
 [[ \${2%.webm} == *.* ]] && echo "No dots are allowed as part of the filname except for the file extension .webm!" && help=1
 
@@ -91,13 +92,17 @@ if [[ \$help -eq 1 ]]; then
     echo '\$3: Duration of recording in seconds. 0 = real duration of recording (default).'
     echo '\$4: Enter "true" to convert to mp4.'
 else
-    # Script would also work from any other directory as long as it has an ~/.env file in it.
+    # Script would also work from any other directory as long as it has an ./.env file in it.
     cd /opt/bbb-recorder
 
     exec node export.js "\$@"
 fi
 EOF
-    sed s/export.js/liveJoin.js/ bbb-recorder-export.sh > bbb-recorder-livejoin.sh
+
+    sed -e "s/export.js/liveJoin.js/" \
+        -e "s/recording link/join link/" \
+        -e "s/real duration of recording/until the end of the meeting/" \
+        bbb-recorder-export.sh > bbb-recorder-livejoin.sh
 
     cd "$srcdir"/bbb-recorder
     # Google Chrome has a different filename than on Debain, need to change it to something else!
@@ -108,28 +113,33 @@ EOF
 
 build() {
     cd "$srcdir"/bbb-recorder
-    npm install --ignore-scripts --no-progress --silent --no-fund --no-package-lock
-    npm install --ignore-scripts --no-progress --silent --no-fund --no-package-lock examples 
+    npm install --ignore-scripts --silent --no-package-lock
+    npm install --ignore-scripts --silent --no-package-lock examples
     find -name package.json -exec sed -i '/_where/d' {} +
 }
 
 package() {
     install -Dm755 bbb-recorder-export.sh    "$pkgdir"/usr/bin/bbb-recorder
+
     # AFAICT the other scripts are only usable if you adminstrate the BBB server too.
     # install -Dm755 bbb-recorder-livejoin.sh  "$pkgdir"/usr/bin/bbb-recorder-livejoin
     # install -Dm755 bbb-recorder-broadcast.sh "$pkgdir"/usr/bin/bbb-recorder-broadcast
 
-    # Storing it together with the node modules in /opt.
+    # Storing it together with the node modules in /opt, so that the node modules do not need to be installed globally.
     install -Dm644 "$srcdir"/bbb-recorder/.env.example -t "$pkgdir"/opt/bbb-recorder/
     cp -a "$srcdir"/bbb-recorder/* "$pkgdir"/opt/bbb-recorder/
 
     # Did that already by listing them as package dependencies.
     rm "$pkgdir"/opt/bbb-recorder/dependencies_check.sh
 
-    # Need to do that differently (like in the bbb-recorder-git.install script).
+    # Need to do that differently (like in the bbb-recorder.install script).
     # It even seems that the namespaceing for users is not needed.
     rm "$pkgdir"/opt/bbb-recorder/namespace_checker.sh
 
-    install -dm755 "$pkgdir"/usr/share/licenses/bbb-recorder/
-    mv "$pkgdir"/opt/bbb-recorder/LICENSE "$pkgdir"/usr/share/licenses/bbb-recorder/
+    # Example script for usage with docker-compose, should not be used without it.
+    chmod 644 "$pkgdir"/opt/bbb-recorder/start_stream.sh
+    mv "$pkgdir"/opt/bbb-recorder/start_stream.sh "$pkgdir"/opt/bbb-recorder/docker-compose.start_stream.sh
+
+    install -dm755 "$pkgdir"/usr/share/licenses/$pkgname/
+    mv "$pkgdir"/opt/bbb-recorder/LICENSE "$pkgdir"/usr/share/licenses/$pkgname/
 }
diff --git a/bbb-recorder.install b/bbb-recorder.install
index bf4f35f672a0..d3fc12dd6d38 100644
--- a/bbb-recorder.install
+++ b/bbb-recorder.install
@@ -13,6 +13,13 @@ post_upgrade() {
     fi
 }
 
+post_remove() {
+    if [ -e /opt/bbb-recorder/.env ]
+    then
+        echo "Configuration file /opt/bbb-recorder/.env is left and can be removed."
+    fi
+}
+
 welcome_message() {
     post_upgrade
     echo ""