various fixes

[buildscripts] / pithosfly

diff --git a/pithosfly b/pithosfly
index 085666325e829b3fb06817441905ec325d88baa6..7d45443941c3039af10a40f2514e7281624349f0 100755 (executable)
--- a/pithosfly
+++ b/pithosfly
@@ -1,20 +1,27 @@
-#!/bin/bash -l
-
-set -eE -o pipefail
-trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
+#!/bin/bash
+# Copyright (C) 2019 Ian Kelling
+# SPDX-License-Identifier: AGPL-3.0-or-later
+if [[ -s ~/.bashrc ]];then . ~/.bashrc;fi
 
 
 # pithosfly environment var is set in environment.sh
 
+# already installed
+if type -t pithos &>/dev/null; then
+  exit 0
+fi
+
+# this doesn't update automatically, so
+
 p -y build-dep pithos
 # other than pithos, based on failures
 pi pithos gstreamer1.0-plugins-ugly intltool python3-mutagen
 
 # from https://github.com/pithos/pithos/wiki/Installing-from-Source
 pi meson python3-gi python3-gi-cairo \
-  gir1.2-gstreamer-1.0 gir1.2-gst-plugins-base-1.0 gstreamer1.0-plugins-good gstreamer1.0-plugins-bad  \
-  gir1.2-secret-1 libgdk-pixbuf2.0-dev libglib2.0-dev gnome-keyring appstream-util libappstream-glib-dev \
-  python3-pylast gir1.2-appindicator3-0.1 gir1.2-keybinder-3.0 gnome-icon-theme-symbolic libxml2-utils gvfs
+   gir1.2-gstreamer-1.0 gir1.2-gst-plugins-base-1.0 gstreamer1.0-plugins-good gstreamer1.0-plugins-bad  \
+   gir1.2-secret-1 libgdk-pixbuf2.0-dev libglib2.0-dev gnome-keyring appstream-util libappstream-glib-dev \
+   python3-pylast gir1.2-appindicator3-0.1 gir1.2-keybinder-3.0 gnome-icon-theme-symbolic libxml2-utils gvfs
 
 cd /a/opt/Pithosfly
 ./autogen.sh