Change the default checkout location to something more likely, though it

should still be customized by the user; add UID check; fix bug with
non-existent repo directories (thanks to Mauro for the even less buggy fix);
fix bug with a subshell that prevented sspm from exiting on one error - it was
meant to be a group command; convert the su block into a normal block; add a
couple more exclusions to the tar command to skip backup and tags files - and
throw a note into the ChangeLog so users don't get surprised by the repo
moving or having its ownership changed
This commit is contained in:
slakmagik 2009-09-27 00:17:20 +00:00
parent 177e710d17
commit 81e337a664
2 changed files with 34 additions and 31 deletions

View File

@ -23,4 +23,7 @@ enhancements:
* Be more strict validating YES/NO configuration variables.
* Add a KNOWN_ISSUES file - if you encounter a bug, check this file before
reporting it to see if it's known and if there's a workaround.
* Modify sspm to be root-only and change the default checkout location. In
case it isn't obvious, this means the checkout will be root-owned if it
isn't already.
+--------------------------+

View File

@ -6,10 +6,8 @@
script=${0##*/}
# USER-MODIFIABLE VARIABLES
# this needs to be where the checked out svn directory is. The 'sbopkg' part
# is 'sbopkg-read-only' if doing a default checkout and is the only thing that
# is likely to need changing.
repo="/home/slackbuilds/sbopkg"
# this needs to be where the checked out svn directory is.
repo="/tmp/sbopkg-read-only"
remote_repo="http://sbopkg.googlecode.com/svn/trunk/"
export OUTPUT="${OUTPUT:-/tmp}"
@ -46,10 +44,16 @@ while getopts :bis opt; do
esac
done
# Make sure we are root.
if (( $(id -u) != 0 )); then
echo "$script: $script must be run by the root user." 1>&2
exit 1
fi
if [[ $sync == yes ]]; then
if [ -w $repo/.. ]; then
if [[ -w $repo ]] || [[ ! -e $repo && -w ${repo%/*} ]]; then
svn checkout $remote_repo $repo ||
( echo "$script: checkout failed" 1>&2; exit 1 )
{ echo "$script: checkout failed" 1>&2; exit 1; }
else
printf "$script: $repo is not writable.\n" 1>&2
printf "Change your privileges or the value of the \"repo\" " 1>&2
@ -79,19 +83,16 @@ if [[ $build == yes || $inst == yes ]]; then
exit 1
fi
# technically, you only need to be root to install the packages and not to
# build them, but standard slackbuilds don't build as unprivileged user
# anyway
output_pkg=$OUTPUT/sbopkg-$VERSION-noarch-1_cng.tgz
su -c "(
if [[ $build == yes ]]; then
cd $repo
if [ -d sbopkg-$VERSION ] || [ -d root-tools ]; then
echo \"$script: director(y|ies) exist\" 1>&2; exit 1
echo "$script: director(y|ies) exist" 1>&2; exit 1
fi
cp -r src sbopkg-$VERSION
cp -r tools root-tools
tar --exclude='*.svn*' --exclude='*.rej' \
--exclude='*~' --exclude='tags' \
-czvf $repo/root-tools/sbopkg-$VERSION.tar.gz sbopkg-$VERSION
cd $repo/root-tools
sh sbopkg.SlackBuild
@ -103,8 +104,7 @@ if [[ $build == yes || $inst == yes ]]; then
if [ -r $output_pkg ]; then
upgradepkg --install-new --reinstall $output_pkg
else
echo \"$script: $output_pkg not found.\" 1>&2; exit 1
echo "$script: $output_pkg not found." 1>&2; exit 1
fi
fi
)"
fi