Skip to content

Commit 1b09cff

Browse files
Merge pull request #237 from profullstack/wip/local-edits-20261102
Land parked local edits: ftb tax dir, root-ubuntu marker, feedback sites.d
2 parents 640d588 + 8729736 commit 1b09cff

6 files changed

Lines changed: 10 additions & 3 deletions

File tree

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1670,7 +1670,7 @@ ftb status
16701670
```
16711671

16721672
- **Which form, which line.** `src/ftb-extract.py` (PyMuPDF) reads every PDF
1673-
under `--dir` (default `~/dottemplates/docs/taxes/years`): Form 100S line 20
1673+
under `--dir` (default `~/Documents/taxes/years` (override with `FTB_TAX_DIR`)): Form 100S line 20
16741674
"net income for tax purposes" and line 15 for a corporation, Form 540 line 17
16751675
"California AGI" plus filing status, name, SSN and address for a person. Only
16761676
the last five closed years count; newest first, line 20 before 15.

‎bin/ftb.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ import { isMain } from '../src/is-main.ts';
6161
import { pullVault } from '../src/vault.ts';
6262
import { WcagError } from '../src/wcag.ts';
6363

64-
const DEFAULT_DIR = join(homedir(), 'dottemplates', 'docs', 'taxes', 'years');
64+
const DEFAULT_DIR = process.env.FTB_TAX_DIR ?? join(homedir(), 'Documents', 'taxes', 'years');
6565

6666
const USAGE = `Usage:
6767
ftb secrets [--dir D] [--json] the shared secrets each filed CA return supports, best first

‎bin/submitfleet.ts‎

100644100755
File mode changed.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"branch": "master",
3+
"env_remove": ["TURSO_DATABASE_URL", "TURSO_AUTH_TOKEN"],
4+
"db_sslparams": "sslmode=require"
5+
}

‎root-ubuntu.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6297,6 +6297,7 @@ write_landing_page() {
62976297
# difference between that page and a real one somebody wrote.
62986298
if [[ -e "$LANDING" ]] \
62996299
&& ! grep -q "$LANDING_MARKER" "$LANDING" \
6300+
&& ! grep -q 'generated by dotfiles/install/root-ubuntu.sh' "$LANDING" \
63006301
&& ! grep -q 'generated by dottemplates/root-ubuntu.sh' "$LANDING" \
63016302
&& ! grep -q 'User pages are at' "$LANDING"; then
63026303
info "$LANDING was edited by hand -- leaving it alone"

‎test/root-ubuntu.test.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,8 @@ describe('upgrading a box that this script already provisioned', () => {
359359
// script has stamped. Renaming the marker without keeping the old one makes
360360
// every already-provisioned box decide its own page was hand-edited, and
361361
// nothing afterwards can tell that page from one somebody really wrote.
362-
it('still recognises the marker from when this lived in the dotfiles repo', () => {
362+
it('still recognises prior dotfiles and dottemplates landing pages', () => {
363+
expect(SOURCE).toContain('generated by dotfiles/install/root-ubuntu.sh');
363364
expect(SOURCE).toContain('generated by dottemplates/root-ubuntu.sh');
364365
expect(SOURCE).toContain('generated by cli-tools/root-ubuntu.sh');
365366
});

0 commit comments

Comments
 (0)