[PC-BSD Commits] r17412 - in pbi/modules/audio/musicpd: . scripts
svn at pcbsd.org
svn at pcbsd.org
Mon Jun 25 08:08:44 PDT 2012
Author: kenmoore
Date: 2012-06-25 15:08:44 +0000 (Mon, 25 Jun 2012)
New Revision: 17412
Modified:
pbi/modules/audio/musicpd/pbi.conf
pbi/modules/audio/musicpd/scripts/post-install.sh
Log:
Remove the group/user scripting stuff from audio/musicpd and rebuild
Modified: pbi/modules/audio/musicpd/pbi.conf
===================================================================
--- pbi/modules/audio/musicpd/pbi.conf 2012-06-25 15:05:58 UTC (rev 17411)
+++ pbi/modules/audio/musicpd/pbi.conf 2012-06-25 15:08:44 UTC (rev 17412)
@@ -30,6 +30,6 @@
PBI_REQUIRESROOT="YES"; export PBI_REQUIRESROOT
-PBI_BUILDKEY="05"; export PBI_BUILDKEY
+PBI_BUILDKEY="06"; export PBI_BUILDKEY
export PBI_PROGNAME PBI_PROGWEB PBI_PROGAUTHOR PBI_PROGICON PBI_MAKEPORT PBI_MAKEOPTS
Modified: pbi/modules/audio/musicpd/scripts/post-install.sh
===================================================================
--- pbi/modules/audio/musicpd/scripts/post-install.sh 2012-06-25 15:05:58 UTC (rev 17411)
+++ pbi/modules/audio/musicpd/scripts/post-install.sh 2012-06-25 15:08:44 UTC (rev 17412)
@@ -1,43 +1,5 @@
#!/bin/sh
-if [ -x /usr/sbin/nologin ]; then
- nologin=/usr/sbin/nologin
-else
- nologin=/sbin/nologin
-fi
-mpd_user="mpd"
-mpd_group="mpd"
-mpd_gid=66600
-mpd_uid=66600
-if ! pw groupshow ${mpd_group} -q >/dev/null ; then
- echo "There is no group '${mpd_group}' on this system, so I will try to create it (using group id ${mpd_gid}):"
- if ! pw groupadd ${mpd_group} -g ${mpd_gid} -q ; then
- echo "Failed to create group \"${mpd_group}\"!" >&2
- echo "Please create it manually." >&2
- fi
-else
- echo "I will use the existing group '${mpd_group}':"
-fi
-pw groupshow ${mpd_group}
-
-
-if ! pw usershow ${mpd_user} -q >/dev/null ; then
- echo "There is no account '${mpd_user}' on this system, so I will try to create it (using user id ${mpd_uid}):"
- if ! pw useradd -q -n ${mpd_user} \
- -u ${mpd_uid} -g ${mpd_group} \
- -c "Music Player pseudo user" \
- -d "/home/mpd" -s "${nologin}" \
- -h - ; then
- echo "Failed to create user '${mpd_user}'!" >&2
- echo "Please create it manually." >&2
- else
- echo "User '${mpd_user}' created successfully:"
- fi
-else
- echo "I will use the existing user '${mpd_user}':"
-fi
-
-
mkdir -p /var/mpd/music >/dev/null 2>/dev/null
mkdir -p /var/mpd/.mpd/playlists >/dev/null 2>/dev/null
#chmod 777 /var/mpd/music
More information about the Commits
mailing list