利用 vimdiff 递归对比文件夹差异

最近遇到需要对比两个文件夹下文件内容差异的操作, linux-cli 下没有找到合适的工具,所以写了个脚本来解决这个问题。功能类似于 Beyond Compare

功能说明

  • 利用 shell 脚本实现 递归对比文件夹差异
  • 此处脚本硬链为 diffdir 命令

操作示例

  1. dir1 dir2 两个文件夹,内容结构如下

    ➜  test-fir-diff-dir git:(master) ✗ tree
    .
    ├── dir1
    │   └── test.sh
    └── dir2
        └── test.sh
    
    2 directories, 2 files
    ➜  test-fir-diff-dir git:(master) ✗ cat dir1/test.sh
    #!/bin/bash
    
    echo "test one"
    echo "I have exit func"
    exit
    ➜  test-fir-diff-dir git:(master) ✗ cat dir2/test.sh
    #!/bin/bash
    
    echo "test one"
  2. 利用 diffdir 命令进行文件夹对比

    ➜  test-fir-diff-dir git:(master) ✗ diffdir ./dir1 ./dir2

    结果如下图:
    clipboard.png

    如果文件夹下有多文件差异,只需在 vim 的命令模式下,键入 qa 即可进入下一对文件对比结果界面。

脚本说明

  • 源码地址:Github-diffdir
  • 依赖:vimdiff diff
  • 功能:递归对比两个文件夹下的文件差异
  • 操作环境:*nix cli
  • 操作要求:vimdiff 基本操作
  • 安装

    git clone https://github.com/fevin/diffdir.git diffdir && cd diffdir
    ln diffdir.sh /usr/local/bin/diffdir
os@BHDS08:/home/shzhgao/work/mount$ ls error normal system system_err system.img test.txt os@BHDS08:/home/shzhgao/work/mount$ diff error normal/ Common subdirectories: error/acct and normal/acct Common subdirectories: error/avm and normal/avm Common subdirectories: error/bhd and normal/bhd Common subdirectories: error/bhd1 and normal/bhd1 diff: error/bin: No such file or directory diff: normal/bin: No such file or directory diff: error/bugreports: No such file or directory diff: normal/bugreports: No such file or directory Common subdirectories: error/cache and normal/cache diff: error/charger: No such file or directory diff: normal/charger: No such file or directory Common subdirectories: error/config and normal/config Common subdirectories: error/data and normal/data diff: error/default.prop: No such file or directory Common subdirectories: error/dev and normal/dev diff: error/etc: No such file or directory diff: normal/etc: No such file or directory diff: error/init: Permission denied diff: normal/init: Permission denied diff: error/init.environ.rc: Permission denied diff: normal/init.environ.rc: Permission denied diff: error/init.rc: Permission denied diff: normal/init.rc: Permission denied diff: error/init.usb.configfs.rc: Permission denied diff: normal/init.usb.configfs.rc: Permission denied diff: error/init.usb.rc: Permission denied diff: normal/init.usb.rc: Permission denied diff: error/init.zygote32.rc: Permission denied diff: normal/init.zygote32.rc: Permission denied diff: error/init.zygote64_32.rc: Permission denied diff: normal/init.zygote64_32.rc: Permission denied Common subdirectories: error/lost+found and normal/lost+found Common subdirectories: error/mnt and normal/mnt Common subdirectories: error/odm and normal/odm Common subdirectories: error/oem and normal/oem Common subdirectories: error/proc and normal/proc diff: error/product: No such file or directory diff: normal/product: No such file or directory Common subdirectories: error/sbin and normal/sbin diff: error/sdcard: No such file or directory diff: normal/sdcard: No such file or directory Common subdirectories: error/storage and normal/storage Common subdirectories: error/sys and normal/sys Common subdirectories: error/system and normal/system Binary files error/ueventd.rc and normal/ueventd.rc differ Common subdirectories: error/vendor and normal/vendor os@BHDS08:/home/shzhgao/work/mount$ 指令是这么用的吗
最新发布
06-04
评论
添加红包

请填写红包祝福语或标题

红包个数最小为10个

红包金额最低5元

当前余额3.43前往充值 >
需支付:10.00
成就一亿技术人!
领取后你会自动成为博主和红包主的粉丝 规则
hope_wisdom
发出的红包
实付
使用余额支付
点击重新获取
扫码支付
钱包余额 0

抵扣说明:

1.余额是钱包充值的虚拟货币,按照1:1的比例进行支付金额的抵扣。
2.余额无法直接购买下载,可以购买VIP、付费专栏及课程。

余额充值