Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

patches #19

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

patches #19

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fc11677
Remove ancient compatibility warning. This was there as the original
grimreaper May 25, 2013
201b230
Simplify check for root UID. The ps one is confusing and atypical.
grimreaper May 25, 2013
4d8e693
/usr/X11R6 is not used any longer
grimreaper May 25, 2013
5367451
Modify version string so I know which version I am running.
grimreaper May 25, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 2 additions & 11 deletions portmaster
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,9 @@ if [ -z "$PM_PARENT_PID" ]; then

# /usr/local is needed in the path for make
PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin
[ -e /usr/X11R6 ] && [ ! -L /usr/X11R6 ] && PATH=$PATH:/usr/X11R6/bin
[ -n "$CCACHE_PATH" -a -z "$NOCCACHE" ] && PATH="/usr/local/libexec/ccache:$PATH"
export PM_PARENT_PID TMPDIR UPGRADE_TOOL PATH

if [ -r /etc/portmaster.rc ]; then
echo '' ; echo "===>>> WARNING"
echo ' Your portmaster.rc is in /etc, however support for the file in this'
echo ' location has been removed.'
echo '' ; echo ' The proper location for this file is /usr/local/etc'
exit 1
fi

set -o allexport
# Read a global rc file first
[ -s /usr/local/etc/portmaster.rc ] && . /usr/local/etc/portmaster.rc
Expand All @@ -41,13 +32,13 @@ if [ -z "$PM_PARENT_PID" ]; then
my_environment=`set`

# If we are already root, unset this to avoid potential conflict
[ `ps -o uid= $$` -eq 0 ] && unset PM_SU_CMD PM_SU_VERBOSE
[ `id -g` -eq 0 ] && unset PM_SU_CMD PM_SU_VERBOSE
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see the benefit in changing this.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

because this is more obvious about what its doing and is easier to grep for (I noticed this when debugging a problem w.r.t. to portmaster & SU_CMD)

fi

#=============== Begin functions we always want to have ===============

version () {
echo '' ; echo "===>>> Version 3.16"
echo '' ; echo "===>>> Version 3.16-git"
#svn='$FreeBSD: user/dougb/portmaster/portmaster 241090 2012-10-01 08:32:05Z dougb $'
}

Expand Down