Trivial: fix references to share/rpcuser (now share/rpcauth) #13664

1. 
   masonicboom commented at 5:32 PM on July 14, 2018: none

   Commit 3fdb297 renamed share/rpcuser to share/rpcauth but left references to the old path in code; this commit fixes the old references.

   -BEGIN VERIFY SCRIPT-
   git grep --files-with-matches 'share/rpcuser' src/*.cpp | xargs sed -i -E 's:share/rpcuser:share/rpcauth:g'
   git grep --files-with-matches 'share/rpcuser' test/functional/*.py | xargs sed -i -E 's:share/rpcuser:share/rpcauth:g'
   -END VERIFY SCRIPT-
   

2. 
   masonicboom commented at 5:41 PM on July 14, 2018: none

   @hkjn got time for a review? This is just a little cleanup from an old change of yours. Also tagging @laanwj who merged that one.

3. masonicboom force-pushed on Jul 14, 2018
4. 
   sipa commented at 6:55 PM on July 14, 2018: member

   Can this be implemented as a scripted diff?

5. in doc/man/bitcoin-qt.1:517 in 77b9633adc outdated

    513 | @@ -514,7 +514,7 @@ Password for JSON\-RPC connections
    514 |  .IP
    515 |  Username and hashed password for JSON\-RPC connections. The field
    516 |  <userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A
    517 | -canonical python script is included in share/rpcuser. The client
    518 | +canonical python script is included in share/rpcauth. The client
   

   ---

   ---

   

   MarcoFalke commented at 7:01 PM on July 14, 2018:

   ." DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.

   ---

   

   masonicboom commented at 12:13 AM on July 15, 2018:

   Fixing

6. in src/qt/bitcoinstrings.cpp:234 in 77b9633adc outdated

    230 | @@ -231,7 +231,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
    231 |  QT_TRANSLATE_NOOP("bitcoin-core", ""
    232 |  "Username and hashed password for JSON-RPC connections. The field <userpw> "
    233 |  "comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical python script is "
    234 | -"included in share/rpcuser. The client then connects normally using the "
    235 | +"included in share/rpcauth. The client then connects normally using the "
   

   ---

   ---

   

   MarcoFalke commented at 7:02 PM on July 14, 2018:

   // Automatically generated by extract_strings_qt.py

   ---

   

   masonicboom commented at 12:13 AM on July 15, 2018:

   Fixing

7. masonicboom force-pushed on Jul 15, 2018
8. masonicboom force-pushed on Jul 15, 2018
9. masonicboom force-pushed on Jul 15, 2018
10. fanquake added the label Docs on Jul 15, 2018
11. 
    masonicboom commented at 3:16 AM on July 15, 2018: none

    Thanks for review. @MarcoFalke I made the fixes you mentioned. @sipa it’s now a scripted diff.

12. 
    fanquake commented at 12:41 PM on July 15, 2018: member

    utACK c38d567

    The only instances of share/rpcuser left in the code are in old release-notes, doc/man and bitcoinstrings.cpp

    I also removed the reference to codemod from the PR description, as that isn't required.

13. 
    MarcoFalke commented at 3:58 PM on July 15, 2018: member

    utACK c38d567cbf25495fea7e941c75b3603e79d58061. Just noting that the scripted diff also modifies files that are not tracked by git. So I'd prefer to not do this 3-line change as a scripted diff, but I don't care either way.

14. MarcoFalke added this to the milestone 0.17.0 on Jul 15, 2018
15. 
    practicalswift commented at 11:27 PM on July 15, 2018: contributor

    utACK c38d567cbf25495fea7e941c75b3603e79d58061 modulo having the scripted-diff changed so that it only touches files tracked by git per @MarcoFalke:s feedback

16. scripted-diff: Fix references to share/rpcuser (now share/rpcauth)

    Commit 3fdb29778a0b598d4ddf05ec5ed4593641d0da6e renamed share/rpcuser to share/rpcauth but left references to the old path in code; this commit fixes the old references.
    
    Performed update using https://github.com/facebook/codemod with command: `codemod --extensions cpp,py,md 'share/rpcuser' 'share/rpcauth'`
    
    -BEGIN VERIFY SCRIPT-
    git grep --files-with-matches 'share/rpcuser' src/*.cpp | xargs sed -i -E 's:share/rpcuser:share/rpcauth:g'
    git grep --files-with-matches 'share/rpcuser' test/functional/*.py | xargs sed -i -E 's:share/rpcuser:share/rpcauth:g'
    -END VERIFY SCRIPT-

    c64cc1bd94
17. masonicboom force-pushed on Jul 16, 2018
18. 
    masonicboom commented at 1:32 AM on July 16, 2018: none

    Ok. I restricted the script to only touch files in version control.

    If someone could point me to a reference on the scripted diff concept I would appreciate it. I'm curious what it buys us in this case.

    Here's a test plan:

    1. pull changes

    2. build

    3. src/bitcoind --help | grep "share/rpcuser" comes up empty.

    4. src/bitcoind --help | grep "share/rpcauth" produces:

       canonical python script is included in share/rpcauth. The client

19. 
    hkjn commented at 8:07 AM on July 16, 2018: contributor

    utACK c64cc1b.

    Thanks for the fix! (In the original commit 3fdb297 I greped for the share/rpcuser.py and rpcuser.py strings, but didn't think to look for references without the .py suffix..)

20. MarcoFalke merged this on Jul 16, 2018
21. MarcoFalke closed this on Jul 16, 2018

    ---

22. MarcoFalke referenced this in commit 171b03de06 on Jul 16, 2018
23. deadalnix referenced this in commit e4c63f13c7 on Apr 13, 2020
24. PastaPastaPasta referenced this in commit 0333c7c377 on Jul 19, 2020
25. PastaPastaPasta referenced this in commit 6c442b46eb on Jul 24, 2020
26. PastaPastaPasta referenced this in commit ff261a3a93 on Jul 27, 2020
27. UdjinM6 referenced this in commit 5cc7a3e959 on Jul 27, 2020
28. UdjinM6 referenced this in commit 189514a831 on Jul 27, 2020
29. ftrader referenced this in commit bdc8d9b69c on Aug 17, 2020
30. DrahtBot locked this on Sep 8, 2021

Contributors

masonicboomsipaMarcoFalkefanquakepracticalswifthkjn

Milestone
0.17.0