常用指令

4.建立分支：git branch 分支名称
查看分支：git branch -a
切换分支：git checkout 分支名称
(每次提交之前删除之前的分支,新建分支)
5.暂存当前目录：git add .
备注修改原因：git commit -m 备注

由本地推到远程：git push origin lfy

从分支中提交合并请求.
到sig/sig目录
点击分支,提合并请求
8.如有特征修改继续在统一分支上提交

9.git log
git reset f5ddbbf19c7e9366647746906b66e09e0ae0d01d
退回到某个版本

git checkout .
撤销修改

电脑卡住点注销不能按关机键

sed -n ‘109993,272826p’ url1109.csv >urlurl.csv

例如搜索 the写法：/the +回车

/+关键字 ，回车即可。此为从文档当前位置向下查找关键字，按n键查找关键字下一个位置；
?+关键字，回车即可。此为从文档挡圈位置向上查找关键字，按n键向上查找关键字；

http://192.168.0.44/assets/user-asset/
web 终端

maxnet@node7:~/signature/tools/macsearch$ scp out_macdr3.csv fengyi_li@192.168.0.23:/home/fengyi_li/everyday/1103/sig/oui/

maxnet@node7:~/signature/tools/macsearch$ scp fengyi_li@192.168.0.23:/home/fengyi_li/everyday/1103/sig/oui/macdr.csv .

sort out_macdr3.csv | less

find -name utf8_desc_all.csv
执行make test
文件变回去 执行 make gbk
把非utf8文件转换回utf8执行 make

http://192.168.0.44/

44

51上

awk -F ‘\t’ ‘{print $2,$3,$4}’ sig_unknown.dat | sort -u -k3 >unmac.csv

./tmp.sh 2>&1 &

后台执行

history
查看之前的指令

awk -F ‘\t’ ‘{print $1}’ sig_unknown.dat | sort -u --parallel=5 > unmac.csv

多核

/data/sig_task/ct-task/sig_unknown

scp maxnet@192.168.110.53:/data/sig_task/ct-task/sig_unknown/unmac.csv .

curl -s http://192.168.0.44:19090/search/ -d ‘[{“value”:"’$1’"}]’ | jq -r ’ map([.type,.decide,.value,.brand,.name,.oui] | join(",") ) | join("\n")’

curl -s http://192.168.0.44:19090/search/ -d ‘[{“value”:“A4402746E87A”}]’ | jq -r ’ map([.type,.decide,.value,.brand,.name,.oui] | join(",") ) | join("\n")’

curl -s http://192.168.0.44:19090/search/ -d ‘[{“value”:“A4402746E87A”}]’ | jq -r ’ map([.type,.decide,.value,.brand,.name,.oui]) ’

jq .data.Brand,.data.Model,.data.Mac jstest.txt
jq .data.Brand,.data.Model,.data.Mac jstest.txt

xzgrep -ia ‘SM-N970U’ sig_unknown.dat.xz

awk取出第三行然后去重
-k3 是取出第三列

:

head -n 10 unmac.csv> test.csv

htop F9回车

wc -l *.csv

maxnet@192.168.110.53:/data/sig_task/ct-task/sig_unknown/unmac232.csv .

shuf input.txt -n 20 -o output.txt
如果不要当前的改动，请重置到库的最新版本：

git reset --hard origin/master

杀掉curl上面的bash进程

kill -9 1139

ps aux | grep bash

ps aux | grep curl

xzless engine_err.20201122.xz

/home/maxnet/db/20201122/

/home/maxnet/db/20201123/engine_err.20201123.xz

/home/maxnet/db/20201123/engine_err.20201123.xz

:set nu

ctrl v shift I
5 >

但是这种后台xshell窗口在退出ssh登录后，进程就会自动结束，如果想继续运行，则需要在命令前加上 nohup 命令,还有log

如 nohup cmd 1 > info.log 2>&1 &

SHIFT i 输入然后 按esc再按向下

df.to_csv(‘my_csv.csv’, mode=‘a’, header=False)
to_csv()方法mode默认为w，我们加上mode=‘a’，便可以追加写入数据。

git diff origin/master sig_bed.yml

vscode连ssh

先登21
make ssh_51

awk -F “,” ‘{C[$2]++}END{for(i in C) print C[i],i}’ tmp_1234.csv | sort -nr > tmp.csv

0 4 * * * cd /data/sig_task/ct-task/sig_unknown/ && ./substr_unknown.sh >> log && ./sig_unknown_sum.sh >> log

nohup grep -E “¹[048C][0-9A-Fa-f]{10}$” unmac242.csv >macout.csv 1 > info.log 2>&1 &

用join可以用str去不掉括号和引号

awk ‘{print substr($1,2,1), $1;C[substr($1,1,1)]++}END{for(i in C)print C[i]" "i}’ new_mac.csv
awk ‘{print substr($1,2,1), $1;C[substr($1,1,1)]++}END{for(i in C)print C[i]" "i}’ new_mac.csv
awk ‘{print substr($1,2,1), $1;C[substr($1,1,1)]++}END{for(i in C)print C[i]" "i}’ new_mac.csv | less
awk ‘{print substr($1,2,1), $1;C[substr($1,1,1)]++}END{for(i in C)print C[i]" "i}’ new_mac.csv | head
awk ‘{C[substr($1,1,1)]++}END{for(i in C)print C[i]" "i}’ new_mac.csv
awk ‘{C[substr($1,2,1)]++}END{for(i in C)print C[i]" "i}’ new_mac.csv
awk ‘{C[substr($1,1,6)]++}END{for(i in C)print C[i]" "i}’ new_mac.csv| sort -nrk1 > new_mac_oui.csv
awk ‘{C[substr($1,1,6)]++}END{for(i in C)print C[i]" "i}’ new_mac.csv| sort -unrk1 > new_mac_oui.csv
awk ‘{C[substr($1,1,6)]++}END{for(i in C)print C[i]" "i}’ new_mac.csv| sort -urk1 > new_mac_oui.csv
awk ‘{C[substr($1,1,6)]++}END{for(i in C)print C[i]","i}’ new_mac.csv| sort -urk1 > new_mac_oui.csv
grep -Eio “text”: “[0-9A-Fa-f]{12}” mac1030.csv |awk -F" ‘{print $3}’ |sort -u > new_mac.csv
grep -Eio “text”: “[0-9A-Fa-f]{12}” mac1030.csv |awk -F" ‘{print $3}’ | head
grep -Eio “text”: “[0-9A-Fa-f]{12}” mac1030.csv |head
grep -Eio “text”: “[0-9A-Fa-f]+” mac1030.csv |head
grep -Eio “text”: “[^,]+” mac1030.csv |head
grep -Eio “text”: [^,]+" mac1030.csv |head
grep -Eio “text”:[^,]+" mac1030.csv |head
grep -Eio “text”[^,]+" mac1030.csv |wc -l
grep -Eio “text”[^,]+" mac1030.csv |head
grep -Eio “text[^,]+” mac1030.csv |head
grep -Eio “text:[^”]+" mac1030.csv |head
grep -Eio “text:[^,]+” mac1030.csv |head
grep -Eo “text:[^,]+” mac1030.csv |head

grep 449CFC …/mac1030.csv
tar acvf img.tgz *.jpg
du -h
wget -i img_url.csv
sort -u err_url.csv > img_url.csv
sort -u err_url.csv | wc -l
grep -f err_mac.csv …/mac1030.csv | awk -F’\t’ ‘{print $2}’ > err_url.csv
grep -f err_mac.csv …/mac1030.csv | awk -F’\t’ ‘{print $2}’ | less
grep -f err_mac.csv …/mac1030.csv | awk -F\t ‘{print $2}’ | less
grep -f err_mac.csv …/mac1030.csv | less
less …/mac1030.csv
cp …/err_mac.csv .
grep “^[0-9A-F][048C]” new_mac.csv > err_mac.csv
grep “^[0-9A-F][048C]” new_mac.csv

make 把正常文件转成UTF8
make jbk

./tmp.sh 2>&1 &

---

1. 0-9A-Fa-f ↩︎