Sed breaking during git filter-branch - android

Has anyone successfully modified files in an Android Studio project throughout the repository history? I'm trying to remove some sensitive data that was entered mistakenly and spans several commits (it's a phone number). I'm attempting to run the following command:
git filter-branch --tree-filter "find . -name '*.java' -print0 | xargs sed -i '' -e 's/xxxxxxxxxx/0000000000/g'"
But I'm immediately getting the error
Rewrite c61760bca0273b8597299146fa5c43f984a50e3c (1/22)sed: can't read : No such file or directory
tree filter failed: find . -name '*.java' -print0 | xargs sed -i '' -e 's/xxxxxxxxxx/0000000000/g'
where xxxxxxxxxx is the number to be switched out. The files in question are stored in a deeper directory, but for some reason sed can't even find them. I'm guessing the error means it fails on the first commit because sed can't read the files? I'm unsure why, because they are definitely local.
Can anyone shed some light on my trouble? Many thanks in advance.

You don't need to worry about obscure flags if you use the BFG, rather than git-filter-branch. The BFG is designed specifically for the case of remove unwanted data- where you don't really care where the bad data is, in what obscure file - you just want it gone.
To use the BFG, create a unwanted.txt file, containing just one line like this:
xxxxxxxxxx==>0000000000
Then run the BFG with this command:
$ java -jar bfg.jar -fi '*.java' --replace-text unwanted.txt my-repo.git
Your entire repository history will be scanned, and all .java files (under 1MB in size) will have the substitutions performed: any matching string (that isn't in your latest commit) will be replaced.
The BFG is typically hundreds of times faster than running git-filter-branch on a big repo and the options are tailored around these two common use-cases:
Removing Crazy Big Files
Removing Passwords, Credentials & other Private data
Full disclosure: I'm the author of the BFG Repo-Cleaner.

Related

Inaccessible or not found [duplicate]

I am making an NW.js app on macOS, and want to run the app in dev mode
by double-clicking on an icon.
In the first step, I'm trying to make my shell script work.
Using VS Code on Windows (I wanted to gain time), I have created a run-nw file at the root of my project, containing this:
#!/bin/bash
cd "src"
npm install
cd ..
./tools/nwjs-sdk-v0.17.3-osx-x64/nwjs.app/Contents/MacOS/nwjs "src" &
but I get this output:
$ sh ./run-nw
: command not found
: No such file or directory
: command not found
: No such file or directory
Usage: npm <command>
where <command> is one of: (snip commands list)
(snip npm help)
npm#3.10.3 /usr/local/lib/node_modules/npm
: command not found
: No such file or directory
: command not found
Some things I don't understand.
It seems that it takes empty lines as commands.
In my editor (VS Code) I have tried to replace \r\n with \n
(in case the \r creates problems) but it changes nothing.
It seems that it doesn't find the folders
(with or without the dirname instruction),
or maybe it doesn't know about the cd command ?
It seems that it doesn't understand the install argument to npm.
The part that really weirds me out, is that it still runs the app
(if I did an npm install manually)...
Not able to make it work properly, and suspecting something weird with
the file itself, I created a new one directly on the Mac, using vim this time.
I entered the exact same instructions, and... now it works without any
issues.
A diff on the two files reveals exactly zero difference.
What can be the difference? What can make the first script not work? How can I find out?
Update
Following the accepted answer's recommendations, after the wrong line
endings came back, I checked multiple things.
It turns out that since I copied my ~/.gitconfig from my Windows
machine, I had autocrlf=true, so every time I modified the bash
file under Windows, it re-set the line endings to \r\n.
So, in addition to running dos2unix (which you will have to
install using Homebrew on a Mac), if you're using Git, check your
.gitconfig file.
Yes. Bash scripts are sensitive to line-endings, both in the script itself and in data it processes. They should have Unix-style line-endings, i.e., each line is terminated with a Line Feed character (decimal 10, hex 0A in ASCII).
DOS/Windows line endings in the script
With Windows or DOS-style line endings , each line is terminated with a Carriage Return followed by a Line Feed character. You can see this otherwise invisible character in the output of cat -v yourfile:
$ cat -v yourfile
#!/bin/bash^M
^M
cd "src"^M
npm install^M
^M
cd ..^M
./tools/nwjs-sdk-v0.17.3-osx-x64/nwjs.app/Contents/MacOS/nwjs "src" &^M
In this case, the carriage return (^M in caret notation or \r in C escape notation) is not treated as whitespace. Bash interprets the first line after the shebang (consisting of a single carriage return character) as the name of a command/program to run.
Since there is no command named ^M, it prints : command not found
Since there is no directory named "src"^M (or src^M), it prints : No such file or directory
It passes install^M instead of install as an argument to npm which causes npm to complain.
DOS/Windows line endings in input data
Like above, if you have an input file with carriage returns:
hello^M
world^M
then it will look completely normal in editors and when writing it to screen, but tools may produce strange results. For example, grep will fail to find lines that are obviously there:
$ grep 'hello$' file.txt || grep -x "hello" file.txt
(no match because the line actually ends in ^M)
Appended text will instead overwrite the line because the carriage returns moves the cursor to the start of the line:
$ sed -e 's/$/!/' file.txt
!ello
!orld
String comparison will seem to fail, even though strings appear to be the same when writing to screen:
$ a="hello"; read b < file.txt
$ if [[ "$a" = "$b" ]]
then echo "Variables are equal."
else echo "Sorry, $a is not equal to $b"
fi
Sorry, hello is not equal to hello
Solutions
The solution is to convert the file to use Unix-style line endings. There are a number of ways this can be accomplished:
This can be done using the dos2unix program:
dos2unix filename
Open the file in a capable text editor (Sublime, Notepad++, not Notepad) and configure it to save files with Unix line endings, e.g., with Vim, run the following command before (re)saving:
:set fileformat=unix
If you have a version of the sed utility that supports the -i or --in-place option, e.g., GNU sed, you could run the following command to strip trailing carriage returns:
sed -i 's/\r$//' filename
With other versions of sed, you could use output redirection to write to a new file. Be sure to use a different filename for the redirection target (it can be renamed later).
sed 's/\r$//' filename > filename.unix
Similarly, the tr translation filter can be used to delete unwanted characters from its input:
tr -d '\r' <filename >filename.unix
Cygwin Bash
With the Bash port for Cygwin, there’s a custom igncr option that can be set to ignore the Carriage Return in line endings (presumably because many of its users use native Windows programs to edit their text files).
This can be enabled for the current shell by running set -o igncr.
Setting this option applies only to the current shell process so it can be useful when sourcing files with extraneous carriage returns. If you regularly encounter shell scripts with DOS line endings and want this option to be set permanently, you could set an environment variable called SHELLOPTS (all capital letters) to include igncr. This environment variable is used by Bash to set shell options when it starts (before reading any startup files).
Useful utilities
The file utility is useful for quickly seeing which line endings are used in a text file. Here’s what it prints for for each file type:
Unix line endings: Bourne-Again shell script, ASCII text executable
Mac line endings: Bourne-Again shell script, ASCII text executable, with CR line terminators
DOS line endings: Bourne-Again shell script, ASCII text executable, with CRLF line terminators
The GNU version of the cat utility has a -v, --show-nonprinting option that displays non-printing characters.
The dos2unix utility is specifically written for converting text files between Unix, Mac and DOS line endings.
Useful links
Wikipedia has an excellent article covering the many different ways of marking the end of a line of text, the history of such encodings and how newlines are treated in different operating systems, programming languages and Internet protocols (e.g., FTP).
Files with classic Mac OS line endings
With Classic Mac OS (pre-OS X), each line was terminated with a Carriage Return (decimal 13, hex 0D in ASCII). If a script file was saved with such line endings, Bash would only see one long line like so:
#!/bin/bash^M^Mcd "src"^Mnpm install^M^Mcd ..^M./tools/nwjs-sdk-v0.17.3-osx-x64/nwjs.app/Contents/MacOS/nwjs "src" &^M
Since this single long line begins with an octothorpe (#), Bash treats the line (and the whole file) as a single comment.
Note: In 2001, Apple launched Mac OS X which was based on the BSD-derived NeXTSTEP operating system. As a result, OS X also uses Unix-style LF-only line endings and since then, text files terminated with a CR have become extremely rare. Nevertheless, I think it’s worthwhile to show how Bash would attempt to interpret such files.
On JetBrains products (PyCharm, PHPStorm, IDEA, etc.), you'll need to click on CRLF/LF to toggle between the two types of line separators (\r\n and \n).
I was trying to startup my docker container from Windows and got this:
Bash script and /bin/bash^M: bad interpreter: No such file or directory
I was using git bash and the problem was about the git config, then I just did the steps below and it worked. It will configure Git to not convert line endings on checkout:
git config --global core.autocrlf input
delete your local repository
clone it again.
Many thanks to Jason Harmon in this link:
https://forums.docker.com/t/error-while-running-docker-code-in-powershell/34059/6
Before that, I tried this, that didn't works:
dos2unix scriptname.sh
sed -i -e 's/\r$//' scriptname.sh
sed -i -e 's/^M$//' scriptname.sh
If you're using the read command to read from a file (or pipe) that is (or might be) in DOS/Windows format, you can take advantage of the fact that read will trim whitespace from the beginning and ends of lines. If you tell it that carriage returns are whitespace (by adding them to the IFS variable), it'll trim them from the ends of lines.
In bash (or zsh or ksh), that means you'd replace this standard idiom:
IFS= read -r somevar # This will not trim CR
with this:
IFS=$'\r' read -r somevar # This *will* trim CR
(Note: the -r option isn't related to this, it's just usually a good idea to avoid mangling backslashes.)
If you're not using the IFS= prefix (e.g. because you want to split the data into fields), then you'd replace this:
read -r field1 field2 ... # This will not trim CR
with this:
IFS=$' \t\n\r' read -r field1 field2 ... # This *will* trim CR
If you're using a shell that doesn't support the $'...' quoting mode (e.g. dash, the default /bin/sh on some Linux distros), or your script even might be run with such a shell, then you need to get a little more complex:
cr="$(printf '\r')"
IFS="$cr" read -r somevar # Read trimming *only* CR
IFS="$IFS$cr" read -r field1 field2 ... # Read trimming CR and whitespace, and splitting fields
Note that normally, when you change IFS, you should put it back to normal as soon as possible to avoid weird side effects; but in all these cases, it's a prefix to the read command, so it only affects that one command and doesn't have to be reset afterward.
Coming from a duplicate, if the problem is that you have files whose names contain ^M at the end, you can rename them with
for f in *$'\r'; do
mv "$f" "${f%$'\r'}"
done
You properly want to fix whatever caused these files to have broken names in the first place (probably a script which created them should be dos2unixed and then rerun?) but sometimes this is not feasible.
The $'\r' syntax is Bash-specific; if you have a different shell, maybe you need to use some other notation. Perhaps see also Difference between sh and bash
Since VS Code is being used, we can see CRLF or LF in the bottom right depending on what's being used and if we click on it we can change between them (LF is being used in below example):
We can also use the "Change End of Line Sequence" command from the command pallet. Whatever's easier to remember since they're functionally the same.
One more way to get rid of the unwanted CR ('\r') character is to run the tr command, for example:
$ tr -d '\r' < dosScript.py > nixScript.py
I ran into this issue when I use git with WSL.
git has a feature where it changes the line-ending of files according to the OS you are using, on Windows it make sure the line endings are \r\n which is not compatible with Linux which uses only \n.
You can resolve this problem by adding a file name .gitattributes to your git root directory and add lines as following:
config/* text eol=lf
run.sh text eol=lf
In this example all files inside config directory will have only line-feed line ending and run.sh file as well.
For Notepad++ users, this can be solved by:
The simplest way on MAC / Linux - create a file using 'touch' command, open this file with VI or VIM editor, paste your code and save. This would automatically remove the windows characters.
If you are using a text editor like BBEdit you can do it at the status bar. There is a selection where you can switch.
For IntelliJ users, here is the solution for writing Linux script.
Use LF - Unix and masOS (\n)
Scripts may call each other.
An even better magic solution is to convert all scripts in the folder/subfolders:
find . -name "*.sh" -exec sed -i -e 's/\r$//' {} +
You can use dos2unix too but many servers do not have it installed by default.
For the sake of completeness, I'll point out another solution which can solve this problem permanently without the need to run dos2unix all the time:
sudo ln -s /bin/bash `printf 'bash\r'`

Can't execute update-binary in recovery

This is my first question and hopefully I am making my question clear.
I am trying to make a flashable zip for the first time, it contains a shell script, TweakV4AndVol.sh which I hope to run in recovery. The updater-script is like this:
ui_print("ViPER4Android and VolumeBooster Tweak");
ui_print("Mounting System partition...");
run_program("/sbin/busybox", "umount", "/system");
run_program("/sbin/busybox", "mount", "/system");
package_extract_dir("shell", "/tmp");
set_perm(0, 0, 0777, "/tmp/TweakV4AndVol.sh");
ui_print("Applying tweak...");
run_program("/tmp/TweakV4AndVol.sh");
run_program("/sbin/busybox", "umount", "/system");
ui_print("Completed!");
and TweakV4AndVol.sh is like this:
#!/sbin/sh
sed -i.bak 's%<ctl name="DEC4 Volume" value="84" />%<ctl name="DEC4 Volume" value="100" />%' /system/etc/mixer_paths.xml
sed -i.bak '/deep_buffer {/ , /}/ d' /system/etc/audio_policy.conf
I then manually created the path: META-INF > com > google > android > update-binary updater-script and shell > TweakV4AndVol.sh. update-binary was fetched from my device's latest CyanogenMOD nightly ROM.
Next I created a zip file with WinRAR, Store compression. I didn't sign the flashable because I didn't turn on signature check for TWRP (2.8.7.0).
I then got these error messages:
E: Error executing updater binary in zip '/data/media/0//CyanDelta/v4voltweak.zip'
E: Error installing zip file '/data/media/0//CyanDelta/v4voltweak.zip'
I've Googled for update-binary and tried multiple methods, including the one from my CM nightlies, Xposed Framework, and even tried SuperSU alternative (use updater-script as a dummy file) but all were giving me the same error, I suppose the problem should lie somewhere in update-binary but searching for hours doesn't benefit. My friends couldn't figure out what happened either as they told me the archive looks fine to them. Any idea is welcomed. Thanks.
Update: The flashable is finally working after these modifications:
1. Change
sed -i.bak '/deep_buffer {/ , /}/ d' /system/etc/audio_policy.conf
into
sed -i.bak '/deep_buffer {/,/}/ d' /system/etc/audio_policy.conf
and change the first line to
#!/system/bin/sh
(Removing the spaces). This caused a "Unsupported Command" error in bash. As for the second change... I dunno why but that's what I did.
I also modified the default environment on UltraEdit, from DOS to UNIX; and the encoding, from UTF to ANSI. It does flash now though script didn't successfully make the changes, however that'll be much simpler. Thanks.

How to check empty-ness of a folder recursively, excluding a specific folder?

I'm not an expert of linux/unix shell commands.
Sorry for being so specific, but I would like to ask:
Suppose I have a folder and I need to check that it's empty of "simple" files (all files excluding folders/directories), and also ignore a specific folder inside it. How do I do that?
Do note that I intend to run the command on Android (without using the API, because I intend to use it for checking out the info of protected folders), so it might have less commands than the normal shell of linux/unix .
If needed, I can run multiple shell commands, and check the output of each of them before going to the next command.
This may help you
find /path/to/dirs/* -type d -empty \( ! -iname "DIR TO IGNORE" \)
Please check out the below examples, this will list all empty folders within /home/test - excluding the ruby folder
[user#server:/home/test]# mkdir shell bash php ruby perl
[user#server:/home/test]# touch shell/testing.sh
[user#server:/home/test]# find /home/test/* -type d -empty \( ! -iname "ruby" \)
/home/test/bash
/home/test/perl
/home/test/php
OK, I've handled it by checking for each of the files recursively, and ignored those that are in the path i wanted to ignore using Java.
The terminal command is:
find /PATH/TO/FOLDER/* -type f
If anyone else can also make it skip a specific folder, that would be nice.

can I use cygwin with bash script to update Android manifest on commit?

I found this link https://stackoverflow.com/questions/6579697/android-how-to-make-the-versioncode-update-automatically-with-every-build that contains the following code:
#!/usr/bin/env bash
MANIFEST="AndroidManifest.xml"
if [ -f $MANIFEST ]
then
LINE=$(grep -o ${MANIFEST} -e 'android:versionCode="[0-9]*"');
declare -a LINE;
LINE=(`echo $LINE | tr "\"" " "`);
VERSION=(${LINE[1]});
INCREMENTED=$(($VERSION+1))
sed "s/android:versionCode=\"[0-9]*\"/android:versionCode=\"${INCREMENTED}\"/" $MANIFEST > $MANIFEST.tmp && mv $MANIFEST.tmp $MANIFEST
git add $MANIFEST
echo "Updated android:versionCode to ${INCREMENTED} in ${MANIFEST}";
fi
I'm using a TortoiseSVN with a windows SVN server however (VisualSVN) so I'm wondering if this could be put into a cygwin command somehow so that the pre-commit hooks in svn can run this? I've not used cygwin much, but am looking for a way to have my version name update every time a commit is built.
Edit: actually it looks like you can use a tool call FARThttp://fart-it.sourceforge.net/ to find and replace text, so i may be able to write a batch script in the SVN pre-commit to find and replace the text.
Edit #2: FART would be more complicated, I'm going to try using the first script, but replace "git add" with "svn add" and see if that works
You can use Maven (which supports Android development) with buildnumber plugin.
It let's you create build numbers via an SCM, via a sequential build number, or via a timestamp. See usage page.
In the same post you mentioned, I posted a different solution, because SVN boldly recommends not changing the commit content with a pre-commit hook , you can make it all go corrupt!
Your manifest can keep the same versionCode forever in svn, instead you should change /bin/AndroidManifest.xml , that is the one which will be packaged in the .apk file

Create a listing of changed files/directories/etc. using git between two tags

I need to generate a changelog of sorts between two Tags within a project controlled using git, specifically the android source code. This list should include any files/directories/etc which have been edited, moved, renamed, deleted, created.
Any help would be great. And if you have a way to do this over the entire android source at once... even better.
If you need to find which files differ:
git diff --name-only <tag1> <tag2>
If you need to find all changed files:
git log --name-only --pretty=format: <tag1>..<tag2> |
grep -v '^$' | sort | uniq
The --pretty=format: is to supress printing information about commits, and print only the diff part. Note that in the case of git log the order of <tag1> and <tag2> matters.
As I mention in the comments, "How do I find common files changed between git branches?" is the main solution here:
git log [--pretty=<format>] --name-only tag1..tag2
or
git diff --name-only tag1 tag2
(Also mentioned in Gitology recipe)
BUT: as mentioned in "How to get a list of directories deleted in my git repository?", Git only tracks content of files, not directories themselves.
To include informations about directories, you need to start playing with git diff-tree.
any directory that has been created or removed will have 040000 in the second or first column and 000000 in the first or second column respectively. This are the tree entry 'modes' for the left and right entries.
Something like (according to Charles Bailey):
git diff-tree -t origin/master master | grep 040000 | grep -v -E '^:040000 040000'

Categories

Resources