overdue commit lots of changes

[buildscripts] / pithosfly

diff --git a/pithosfly b/pithosfly
index 085666325e829b3fb06817441905ec325d88baa6..8676ae0be604f6e5f111836f6eb59feee8cbad8b 100755 (executable)
--- a/pithosfly
+++ b/pithosfly
@@ -1,22 +1,47 @@
-#!/bin/bash -l
+#!/bin/bash
+# I, Ian Kelling, follow the GNU license recommendations at
+# https://www.gnu.org/licenses/license-recommendations.en.html. They
+# recommend that small programs, < 300 lines, be licensed under the
+# Apache License 2.0. This file contains or is part of one or more small
+# programs. If a small program grows beyond 300 lines, I plan to switch
+# its license to GPL.
 
-set -eE -o pipefail
-trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
+# Copyright 2024 Ian Kelling
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+
+#     http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+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
-make
-sudo make install
+meson build
+ninja -C build