Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[tools] Sanitize extra scripts and gitignores #4337

Merged
merged 1 commit into from
Nov 18, 2020

Conversation

kkm000
Copy link
Contributor

@kkm000 kkm000 commented Nov 15, 2020

  • Fork off tools/.gitignore from the root file.
  • Make gitignores sensible by using wildcards. Listing every possible versioned package name had been unmaintainable.
  • Make all extra scripts executable, and trim EOL/EOF whitespace.

* Fork off tools/.gitignore from the root file.
* Make gitignores sensible by using wildcards. Listing every
  possible versioned package name had been unmaintainable.
* Make all extra scripts executable, and trim EOL/EOF whitespace.
@danpovey
Copy link
Contributor

Is the empty file install_nkf.sh new?

@kkm000
Copy link
Contributor Author

kkm000 commented Nov 18, 2020

Should not be. Something is wrong. Let me figure out.

@kkm000
Copy link
Contributor Author

kkm000 commented Nov 18, 2020

The GitHub's message "empty file" is nonsense, it's an empty diff, not empty file. Three script files did not have the executable bit set. Of these, tools/extras/install_pfile_utils.sh had other changes, and is shown normally on GitHub. The other two, install_{nkf,liblbfgs}.sh, where the only change is their mode bits, have the message "empty file". The diff of this file correctly shows only a mode change.

I'll double-check after merge that they won't become empty :)

~/work/kaldi[2011-sanitize-tools-extra]$ git show -- tools/extras/install_nkf.sh
commit e4c24a1cd857e9a29359c53b5c246ec8049ee2f4
Author: kkm <kkm@pobox.com>
Date:   Sat Nov 14 17:40:21 2020 -0800

    [tools] Sanitize extra scripts and gitignores

    * Fork off tools/.gitignore from the root file.
    * Make gitignores sensible by using wildcards. Listing every
      possible versioned package name had been unmaintainable.
    * Make all extra scripts executable, and trim EOL/EOF whitespace.

diff --git a/tools/extras/install_nkf.sh b/tools/extras/install_nkf.sh
old mode 100644
new mode 100755

@danpovey
Copy link
Contributor

Ah, OK. LGTM, then.

@danpovey danpovey merged commit 3f5bf14 into kaldi-asr:master Nov 18, 2020
@kkm000
Copy link
Contributor Author

kkm000 commented Nov 19, 2020

Thanks, and both files are indeed non-empty after merge! :)

@kkm000 kkm000 deleted the 2011-sanitize-tools-extra branch November 19, 2020 02:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants