diff --git a/README.md b/README.md index 3a39ff29e2e..79063b9841c 100644 --- a/README.md +++ b/README.md @@ -308,45 +308,46 @@ Adobe软件的最佳替代品 [原文在这里](https://linux.cn/article-8928-1. Zijing Zhang Fubin Zhang __FresHmaN -dulltackle -ernest 谈笑风生间 +ernest +dulltackle zyy2477 -rgshare -loverainye -lavaicer -YEUNGCHIE SteveLauC +YEUNGCHIE MioMuse James Wang +lavaicer +loverainye +rgshare Qliangw -Wang Yujia -alfred 沙漠之子 +Wang Yujia Shell xhal will VVatt gggwvg -Dazhuangw -Alterem -YH -Xrtero -Xingwen Zhang -Shan Chenyu -RichardLCD -Pan, Wen-Ming -Jeremy2214 +alfred +duzhuoshanwai +Ein Verne BingCoke FunKeen -Ein Verne -lewis1573 -leo -kid1412621 -kassadin -juemuren4449 +Jeremy2214 +Pan, Wen-Ming +QinShower +RichardLCD +Shan Chenyu +Xingwen Zhang +Xrtero +YH +Alterem +Dazhuangw jqz3.tech -Forever121 +juemuren4449 +kassadin +kid1412621 +leo +lewis1573 linuxwd Ricardowang cole @@ -355,55 +356,54 @@ Adobe软件的最佳替代品 [原文在这里](https://linux.cn/article-8928-1. noodles2hg nsnans oliver -cxalc -dayday -Deny -dongpohezui -duzhuoshanwai -ecjtusbs -gang.yang -gedune -gesty -ghy -githubwxz -gcluffy -hotdogc1017 -huangyao -hululu1068 jcdj666 -七朔 -孤城落寞 -尘埃 -Wei Xu -Loofra -扶苏如是 -ReZero -极简XksA -移动的红烧肉 -继刚 -老犁 -Kyofin -谢民皆 -远方 -bycs +hululu1068 +huangyao +hotdogc1017 +gcluffy +githubwxz +ghy +gesty +gedune +gang.yang +ecjtusbs +dongpohezui +Deny +dayday +cxalc +Q.Ben Zheng Yidan Wang -rexlin600 -sfwwslm -shc -shuangcui -snovey -tangke -tutianyu101 -UniqueDing -weibk -Lingfeng Wang -yanyx -zjlovezj -zodiac -zoomdong -zuixin369 +bycs +远方 +谢民皆 +Kyofin +老犁 +继刚 +移动的红烧肉 +极简XksA +ReZero +扶苏如是 +Loofra +Wei Xu +尘埃 +孤城落寞 +七朔 zyimm -Q.Ben Zheng +zuixin369 +zoomdong +zodiac +zjlovezj +yanyx +Lingfeng Wang +weibk +UniqueDing +tutianyu101 +tangke +snovey +shuangcui +shc +sfwwslm +rexlin600 Mystic MinsonLee Marnm @@ -431,9 +431,10 @@ Adobe软件的最佳替代品 [原文在这里](https://linux.cn/article-8928-1. Danny DaYangtuo247 Cui Yang -Azroy +azroy Alan 0x_000 +Forever121 chaofan c2ch brinkqiang @@ -463,8 +464,7 @@ Adobe软件的最佳替代品 [原文在这里](https://linux.cn/article-8928-1. Rocher Robigus Rining Wu -Ray Yee -QinShower +Ray Yee 贡献者列表,由 [contributors](https://github.com/jaywcjlove/github-action-contributors) 自动生成 diff --git a/command/column.md b/command/column.md index 62e30329471..c93c184692b 100644 --- a/command/column.md +++ b/command/column.md @@ -26,6 +26,8 @@ file(可选),当没有指定文件时,默认会从标准输入读取, -s, --separator 指定识别表格的分隔符 -o, --output-separator 输出表格的列分隔符,默认为两个空格 -x, --fillrows 在列之前填充行 +-N, --table-columns 添加列名(逗号分隔) +-J --json 格式化为JSON输出(需要配合-N/--table-columns使用) -h, --help 显示此帮助 -V, --version 输出版本信息 ``` @@ -121,3 +123,54 @@ MemReq Metal3 pin 108.215 159.92 RdWrBar Metal3 pin 87.415 159.92 clock Metal3 pin 74.935 159.92 ``` + +- 添加列名并以JSON格式输出 + +```shell +$ column -J -s ":" -N "Username,Password,UID,GID,Gecos,HomeDirectory,Shell" /etc/passwd +{ + "table": [ + { + "username": "root", + "password": "x", + "uid": "0", + "gid": "0", + "gecos": "root", + "homedirectory": "/root", + "shell": "/bin/bash" + },{ + "username": "daemon", + "password": "x", + "uid": "1", + "gid": "1", + "gecos": "daemon", + "homedirectory": "/usr/sbin", + "shell": "/usr/sbin/nologin" + },{ + "username": "bin", + "password": "x", + "uid": "2", + "gid": "2", + "gecos": "bin", + "homedirectory": "/bin", + "shell": "/usr/sbin/nologin" + },{ + "username": "sys", + "password": "x", + "uid": "3", + "gid": "3", + "gecos": "sys", + "homedirectory": "/dev", + "shell": "/usr/sbin/nologin" + },{ + "username": "sync", + "password": "x", + "uid": "4", + "gid": "65534", + "gecos": "sync", + "homedirectory": "/bin", + "shell": "/bin/sync" + } + ] +} +``` diff --git a/template/contributors.ejs b/template/contributors.ejs index 77ec8c5d696..65bfe00654f 100644 --- a/template/contributors.ejs +++ b/template/contributors.ejs @@ -18,45 +18,46 @@ Zijing Zhang Fubin Zhang __FresHmaN -dulltackle -ernest 谈笑风生间 +ernest +dulltackle zyy2477 -rgshare -loverainye -lavaicer -YEUNGCHIE SteveLauC +YEUNGCHIE MioMuse James Wang +lavaicer +loverainye +rgshare Qliangw -Wang Yujia -alfred 沙漠之子 +Wang Yujia Shell xhal will VVatt gggwvg -Dazhuangw -Alterem -YH -Xrtero -Xingwen Zhang -Shan Chenyu -RichardLCD -Pan, Wen-Ming -Jeremy2214 +alfred +duzhuoshanwai +Ein Verne BingCoke FunKeen -Ein Verne -lewis1573 -leo -kid1412621 -kassadin -juemuren4449 +Jeremy2214 +Pan, Wen-Ming +QinShower +RichardLCD +Shan Chenyu +Xingwen Zhang +Xrtero +YH +Alterem +Dazhuangw jqz3.tech -Forever121 +juemuren4449 +kassadin +kid1412621 +leo +lewis1573 linuxwd Ricardowang cole @@ -65,55 +66,54 @@ noodles2hg nsnans oliver -cxalc -dayday -Deny -dongpohezui -duzhuoshanwai -ecjtusbs -gang.yang -gedune -gesty -ghy -githubwxz -gcluffy -hotdogc1017 -huangyao -hululu1068 jcdj666 -七朔 -孤城落寞 -尘埃 -Wei Xu -Loofra -扶苏如是 -ReZero -极简XksA -移动的红烧肉 -继刚 -老犁 -Kyofin -谢民皆 -远方 -bycs +hululu1068 +huangyao +hotdogc1017 +gcluffy +githubwxz +ghy +gesty +gedune +gang.yang +ecjtusbs +dongpohezui +Deny +dayday +cxalc +Q.Ben Zheng Yidan Wang -rexlin600 -sfwwslm -shc -shuangcui -snovey -tangke -tutianyu101 -UniqueDing -weibk -Lingfeng Wang -yanyx -zjlovezj -zodiac -zoomdong -zuixin369 +bycs +远方 +谢民皆 +Kyofin +老犁 +继刚 +移动的红烧肉 +极简XksA +ReZero +扶苏如是 +Loofra +Wei Xu +尘埃 +孤城落寞 +七朔 zyimm -Q.Ben Zheng +zuixin369 +zoomdong +zodiac +zjlovezj +yanyx +Lingfeng Wang +weibk +UniqueDing +tutianyu101 +tangke +snovey +shuangcui +shc +sfwwslm +rexlin600 Mystic MinsonLee Marnm @@ -141,9 +141,10 @@ Danny DaYangtuo247 Cui Yang -Azroy +azroy Alan 0x_000 +Forever121 chaofan c2ch brinkqiang @@ -173,8 +174,7 @@ Rocher Robigus Rining Wu -Ray Yee -QinShower +Ray Yee

数据来源于 GitHub Contributors,使用action-contributors创建。