fixes for kde6 upgrade

6 files changed, 12 insertions, 8 deletions

diff --git a/files/usr/local/libexec/invidious-sighelper-update.invidious_server b/files/usr/local/libexec/invidious-sighelper-update.invidious_server
index 3f928aa..99b305a 100644
--- a/files/usr/local/libexec/invidious-sighelper-update.invidious_server
+++ b/files/usr/local/libexec/invidious-sighelper-update.invidious_server
@@ -40,7 +40,8 @@ upstream_rev=$(as_invidious 'git rev-parse "@{u}"')
 
 if [ "$local_rev" != "$upstream_rev" ]; then
   echo "updating inv_sig_helper to rev ${upstream_rev}"
-  as_invidious 'git pull --ff-only && cargo build --release'
+  as_invidious 'git pull --ff-only'
+  as_invidious 'cargo build --release'
   service inv_sig_helper status 2>/dev/null && service inv_sig_helper restart
   service invidious status      2>/dev/null && service invidious restart
 else
diff --git a/files/usr/local/libexec/invidious-update.invidious_server b/files/usr/local/libexec/invidious-update.invidious_server
index eb6fcbd..3a444ad 100644
--- a/files/usr/local/libexec/invidious-update.invidious_server
+++ b/files/usr/local/libexec/invidious-update.invidious_server
@@ -40,7 +40,9 @@ upstream_rev=$(as_invidious 'git rev-parse "@{u}"')
 
 if [ "$local_rev" != "$upstream_rev" ]; then
   echo "updating invidious to rev ${upstream_rev}"
-  as_invidious 'git pull --ff-only && shards install --production && crystal build src/invidious.cr --release'
+  as_invidious 'git pull --ff-only'
+  as_invidious 'shards install --production'
+  as_invidious 'crystal build src/invidious.cr --release'
   service invidious status 2>/dev/null && service invidious restart
 else
   echo "invidious already up to date at rev ${local_rev}"
diff --git a/files/usr/local/libexec/pam-create-local-homedir.common b/files/usr/local/libexec/pam-create-local-homedir.common
index 2d30d06..b1ecef5 100644
--- a/files/usr/local/libexec/pam-create-local-homedir.common
+++ b/files/usr/local/libexec/pam-create-local-homedir.common
@@ -1,3 +1,4 @@
 #!/bin/sh
 
 install -o "$PAM_USER" -g "$PAM_USER" -m 0700 -d "/usr/local/home/${PAM_USER}"
+install -o "$PAM_USER" -g "$PAM_USER" -l s "/usr/local/home/${PAM_USER}" "/home/${PAM_USER}/localdisk"
diff --git a/files/usr/local/libexec/poudriere-cron.pkg_repository b/files/usr/local/libexec/poudriere-cron.pkg_repository
index 8f3dff7..e0dee52 100644
--- a/files/usr/local/libexec/poudriere-cron.pkg_repository
+++ b/files/usr/local/libexec/poudriere-cron.pkg_repository
@@ -16,11 +16,11 @@ done
 
 for jail in "$@"; do
   poudriere jail -u  -j "$jail" > /dev/null
-  poudriere bulk     -j "$jail"        -f /usr/local/etc/poudriere.d/idm-pkglist   -p "$ports_tree" -z idm    > /dev/null
+  poudriere bulk     -j "$jail"        -f /usr/local/etc/poudriere.d/idm-pkglist   -p "$ports_tree" -z idm
   poudriere pkgclean -j "$jail"        -f /usr/local/etc/poudriere.d/idm-pkglist   -p "$ports_tree" -z idm -y > /dev/null 2>&1
-  poudriere bulk     -j "$jail"        -f /usr/local/etc/poudriere.d/pkglist       -p "$ports_tree"           > /dev/null
+  poudriere bulk     -j "$jail"        -f /usr/local/etc/poudriere.d/pkglist       -p "$ports_tree"
   poudriere pkgclean -j "$jail"        -f /usr/local/etc/poudriere.d/pkglist       -p "$ports_tree" -y        > /dev/null 2>&1
-  poudriere bulk     -j "${jail}-i386" -f /usr/local/etc/poudriere.d/i386-pkglist  -p "$ports_tree"           > /dev/null
+  poudriere bulk     -j "${jail}-i386" -f /usr/local/etc/poudriere.d/i386-pkglist  -p "$ports_tree"
   poudriere pkgclean -j "${jail}-i386" -f /usr/local/etc/poudriere.d/i386-pkglist  -p "$ports_tree" -y        > /dev/null 2>&1
 done
 
diff --git a/files/usr/local/libexec/prosody-acme-proxy.xmpp_server b/files/usr/local/libexec/prosody-acme-proxy.xmpp_server
index 70faddd..776aae8 100644
--- a/files/usr/local/libexec/prosody-acme-proxy.xmpp_server
+++ b/files/usr/local/libexec/prosody-acme-proxy.xmpp_server
@@ -44,8 +44,8 @@ md5_new=$(md5sum "$CERT_DIR"/*.crt "$CERT_DIR"/*.key | tee "$CHECKSUM_FILE")
 
 # If any certificates differ, reload prosody.
 if [ "$md5_old" != "$md5_new" ]; then
-  if prosodyctl status >/dev/null 2>&1; then
-    prosodyctl reload
+  if service prosody status >/dev/null; then
+    service prosody reload
   else
     echo 'prosody not running, not reloading'
   fi
diff --git a/files/usr/local/libexec/prosody-update-roster.xmpp_server b/files/usr/local/libexec/prosody-update-roster.xmpp_server
index 84c0c6e..68ffded 100644
--- a/files/usr/local/libexec/prosody-update-roster.xmpp_server
+++ b/files/usr/local/libexec/prosody-update-roster.xmpp_server
@@ -46,4 +46,4 @@ foreach my $entry ($search->entries) {
 }
 close $fh;
 
-system('prosodyctl reload');
+system('service prosody reload');