|
14 | 14 | if [ "$OSTYPE" = "msys" ] || [ "$OSTYPE" = "win32" ] || [ "$OSTYPE" = "cygwin" ]; then
|
15 | 15 | # Windows 系统
|
16 | 16 | GPGSIGN=$(git config --get commit.gpgsign || echo "false")
|
17 |
| - SSHSIGN=$(git config --get commit.sshsign || echo "false") |
| 17 | + GPG_FORMAT=$(git config --get gpg.format || echo "openpgp") |
18 | 18 |
|
19 | 19 | echo "检查GPG配置状态: $GPGSIGN"
|
20 |
| - echo "检查SSH配置状态: $SSHSIGN" |
| 20 | + echo "检查GPG格式: $GPG_FORMAT" |
21 | 21 |
|
22 | 22 | if [ "$GPGSIGN" != "true" ]; then
|
23 |
| - if [ "$SSHSIGN" = "true" ]; then |
24 |
| - echo -e "${YELLOW}警告: 当前使用 SSH 密钥签名${NC}" |
25 |
| - echo -e "${YELLOW}请改用 GPG 签名:${NC}" |
26 |
| - echo -e "${YELLOW}1. git config --global commit.sshsign false${NC}" |
27 |
| - echo -e "${YELLOW}2. git config --global commit.gpgsign true${NC}" |
28 |
| - exit 1 |
29 |
| - else |
30 |
| - echo -e "${RED}错误: 未启用 GPG 签名${NC}" |
31 |
| - echo -e "${RED}请运行: git config --global commit.gpgsign true${NC}" |
32 |
| - exit 1 |
33 |
| - fi |
| 23 | + echo -e "${RED}错误: 未启用提交签名${NC}" |
| 24 | + echo -e "${RED}请运行: git config --global commit.gpgsign true${NC}" |
| 25 | + exit 1 |
34 | 26 | fi
|
| 27 | + |
| 28 | + if [ "$GPG_FORMAT" = "ssh" ]; then |
| 29 | + echo -e "${YELLOW}警告: 当前使用 SSH 密钥签名${NC}" |
| 30 | + echo -e "${YELLOW}请改用 GPG 签名:${NC}" |
| 31 | + echo -e "${YELLOW}1. git config --global gpg.format openpgp${NC}" |
| 32 | + exit 1 |
| 33 | + fi |
| 34 | + |
35 | 35 | echo -e "${GREEN}GPG签名检查通过 ✓${NC}"
|
36 | 36 | else
|
37 | 37 | # Linux系统
|
38 | 38 | GPGSIGN=$(git config --get commit.gpgsign || echo "false")
|
39 |
| - SSHSIGN=$(git config --get commit.sshsign || echo "false") |
| 39 | + GPG_FORMAT=$(git config --get gpg.format || echo "openpgp") |
40 | 40 |
|
41 | 41 | printf "检查GPG配置状态: %s\n" "$GPGSIGN"
|
42 |
| - printf "检查SSH配置状态: %s\n" "$SSHSIGN" |
| 42 | + printf "检查GPG格式: %s\n" "$GPG_FORMAT" |
43 | 43 |
|
44 | 44 | if [ "$GPGSIGN" != "true" ]; then
|
45 |
| - if [ "$SSHSIGN" = "true" ]; then |
46 |
| - printf "${YELLOW}警告: 当前使用 SSH 密钥签名${NC}\n" |
47 |
| - printf "${YELLOW}请改用 GPG 签名:${NC}\n" |
48 |
| - printf "${YELLOW}1. git config --global commit.sshsign false${NC}\n" |
49 |
| - printf "${YELLOW}2. git config --global commit.gpgsign true${NC}\n" |
50 |
| - exit 1 |
51 |
| - else |
52 |
| - printf "${RED}错误: 未启用 GPG 签名${NC}\n" |
53 |
| - printf "${RED}请运行: git config --global commit.gpgsign true${NC}\n" |
54 |
| - exit 1 |
55 |
| - fi |
| 45 | + printf "${RED}错误: 未启用提交签名${NC}\n" |
| 46 | + printf "${RED}请运行: git config --global commit.gpgsign true${NC}\n" |
| 47 | + exit 1 |
56 | 48 | fi
|
| 49 | + |
| 50 | + if [ "$GPG_FORMAT" = "ssh" ]; then |
| 51 | + printf "${YELLOW}警告: 当前使用 SSH 密钥签名${NC}\n" |
| 52 | + printf "${YELLOW}请改用 GPG 签名:${NC}\n" |
| 53 | + printf "${YELLOW}1. git config --global gpg.format openpgp${NC}\n" |
| 54 | + exit 1 |
| 55 | + fi |
| 56 | + |
57 | 57 | printf "${GREEN}GPG签名检查通过 ✓${NC}\n"
|
58 | 58 | fi
|
59 | 59 |
|
|
0 commit comments