configs  Diff

Differences From Artifact [0aa3678ce6]:

To Artifact [4f756f3d30]:


32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
		gpg="gpg2"
	elif have gpg; then
		gpg="gpg"
	else
		gpg="false"
	fi

	gpg_key="EC9BE683"
	if $gpg --list-secret-keys $gpg_key >/dev/null 2>&1; then
		fossil set --global pgp-command \
			"$gpg -u $gpg_key --clearsign -o"
		fossil set --global clearsign 1
	else
		fossil unset --global pgp-command
		fossil unset --global clearsign
	fi
fi
have git && link_file git .config/git ../
if have gpg || have gpg2; then
	mkdir -p $HOME/.local/share/gnupg
	chmod 700 $HOME/.local/share/gnupg
	link_file gnupg/gpg.conf .local/share/gnupg/gpg.conf ../../../
	link_file gnupg/scdaemon.conf .local/share/gnupg/scdaemon.conf ../../../
	if have gpg2; then
		gpg="gpg2"
	else
		gpg="gpg"
	fi
	$gpg --import gnupg/keyring.asc
	$gpg --import-ownertrust gnupg/ownertrust







|













<
<







32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52


53
54
55
56
57
58
59
		gpg="gpg2"
	elif have gpg; then
		gpg="gpg"
	else
		gpg="false"
	fi

	gpg_key="DC43171B6BE93978D09AD8B2C601EE21773E7C8F"
	if $gpg --list-secret-keys $gpg_key >/dev/null 2>&1; then
		fossil set --global pgp-command \
			"$gpg -u $gpg_key --clearsign -o"
		fossil set --global clearsign 1
	else
		fossil unset --global pgp-command
		fossil unset --global clearsign
	fi
fi
have git && link_file git .config/git ../
if have gpg || have gpg2; then
	mkdir -p $HOME/.local/share/gnupg
	chmod 700 $HOME/.local/share/gnupg


	if have gpg2; then
		gpg="gpg2"
	else
		gpg="gpg"
	fi
	$gpg --import gnupg/keyring.asc
	$gpg --import-ownertrust gnupg/ownertrust