Attachment 2460 Details for Bug 5360 – Patch to remove failing check for non-empty /etc/mtab

[patch] Patch to remove failing check for non-empty /etc/mtab

gpg-agent.sh (text/plain), 1.06 KB, created by Dave Hodgins on 2012-06-15 02:28:24 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Dave Hodgins

Created: 2012-06-15 02:28:24 CEST

Size: 1.06 KB

patch

obsolete

>#!/bin/sh
>
># Skip processing this file if it's not a regular user or root.
># We cannot use exit because this file is likely sourced.
>if [[ $UID -ge 500 || $UID -eq 0 ]] ; then
>	. /etc/sysconfig/gnupg2
>	if [[ ! -n "$GPG_AGENT_INFO" && "$START_GPGAGENT" = "yes" && \
>		"`echo $GPG_AGENT_NO_USERS | grep \ $UID\  ; echo $?`" -ne 0 && \
>		! -e $HOME/.gnupg/gpg-agent-no-start ]] ; then
>		
>		if [[ "$START_GPGAGENT_SH" = "yes" ]] ; then
>			GPGAGENTINFO="$HOME/.gnupg/gpg-agent-info"
>			NEEDSTART=0
>			if [ -f "$GPGAGENTINFO" ] ; then
>				kill -0 `cut -d: -f 2 "$GPGAGENTINFO"` 2>/dev/null
>			       	if [ $? -eq 0 ] ; then
>					. "$GPGAGENTINFO"
>					export GPG_AGENT_INFO
>				else
>					NEEDSTART=1
>				fi # 
>			else
>				rm -f "$GPGAGENTINFO"
>				NEEDSTART=1
>			fi # -f "$GPGAGENTINFO"
>			if [ ${NEEDSTART} -eq 1 ] ; then
>				if [[ ! -n $GPGAGENT_PARAMS ]] ; then 
>					GPGAGENT_PARAMS="--keep-display"
>				fi
>				eval `gpg-agent ${GPGAGENT_PARAMS} --daemon --write-env-file "$GPGAGENTINFO"`
>			fi # NEEDSTART
>		fi # START_GPGAGENT_SH
>	fi # BIG conditional list
>fi # End of UID clause.

#!/bin/sh

# Skip processing this file if it's not a regular user or root.
# We cannot use exit because this file is likely sourced.
if [[ $UID -ge 500 || $UID -eq 0 ]] ; then
	. /etc/sysconfig/gnupg2
	if [[ ! -n "$GPG_AGENT_INFO" && "$START_GPGAGENT" = "yes" && \
		"`echo $GPG_AGENT_NO_USERS | grep \ $UID\  ; echo $?`" -ne 0 && \
		! -e $HOME/.gnupg/gpg-agent-no-start ]] ; then
		
		if [[ "$START_GPGAGENT_SH" = "yes" ]] ; then
			GPGAGENTINFO="$HOME/.gnupg/gpg-agent-info"
			NEEDSTART=0
			if [ -f "$GPGAGENTINFO" ] ; then
				kill -0 `cut -d: -f 2 "$GPGAGENTINFO"` 2>/dev/null
			       	if [ $? -eq 0 ] ; then
					. "$GPGAGENTINFO"
					export GPG_AGENT_INFO
				else
					NEEDSTART=1
				fi # 
			else
				rm -f "$GPGAGENTINFO"
				NEEDSTART=1
			fi # -f "$GPGAGENTINFO"
			if [ ${NEEDSTART} -eq 1 ] ; then
				if [[ ! -n $GPGAGENT_PARAMS ]] ; then 
					GPGAGENT_PARAMS="--keep-display"
				fi
				eval `gpg-agent ${GPGAGENT_PARAMS} --daemon --write-env-file "$GPGAGENTINFO"`
			fi # NEEDSTART
		fi # START_GPGAGENT_SH
	fi # BIG conditional list
fi # End of UID clause.

Actions: View | Diff

Attachments on bug 5360: 1971 | 2460 | 2463