Skip to content

Commit 02d88b9

Browse files
committed
refactor(mozilla): move config folder of enterprise to right place
1 parent 6c80b29 commit 02d88b9

File tree

11 files changed

+6
-10
lines changed

11 files changed

+6
-10
lines changed

.chezmoi.yaml.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ data:
3636
{{- else }}
3737
company:
3838
{{- end }}
39-
{{ $decryptPersonal := promptBoolOnce . "decryptPersonal" "Do you want to decrypt personal's secrets? (y/n)" true }}
39+
{{ $decryptPersonal := promptBoolOnce . "decryptPersonal" "Do you want to decrypt personal's secrets? (y/n)" false }}
4040
decryptPersonal: {{ $decryptPersonal }}
41-
{{ $decryptEnterprise := promptBool "Do you want to decrypt enterprise's secrets? (y/n)" true }}
41+
{{ $decryptEnterprise := promptBool "Do you want to decrypt enterprise's secrets? (y/n)" false }}
4242
{{- $listDecryptEnterprise := list }}
4343
{{- if $decryptEnterprise }}
4444
decryptEnterprise:

home/.chezmoitemplates/firefox/prefs/enterprise/00-ui.js renamed to home/.chezmoitemplates/firefox/prefs/enterprise-F1/00-ui.js

File renamed without changes.

home/.chezmoitemplates/firefox/prefs/enterprise/01-toolbar.js renamed to home/.chezmoitemplates/firefox/prefs/enterprise-F1/01-toolbar.js

File renamed without changes.

home/.chezmoitemplates/firefox/prefs/enterprise/02-extensions.js renamed to home/.chezmoitemplates/firefox/prefs/enterprise-F1/02-extensions.js

File renamed without changes.

home/.chezmoitemplates/firefox/prefs/enterprise/03-customize.js renamed to home/.chezmoitemplates/firefox/prefs/enterprise-F1/03-customize.js

File renamed without changes.

home/.chezmoitemplates/firefox/prefs/enterprise/04-start-page.js renamed to home/.chezmoitemplates/firefox/prefs/enterprise-F1/04-start-page.js

File renamed without changes.

home/.chezmoitemplates/firefox/user.js.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
{{- $settings := glob (joinPath .chezmoi.sourceDir ".chezmoitemplates/firefox/prefs/*.js*") }}
33
{{- if regexMatch ".*personal/user\\.js\\.tmpl" .chezmoi.sourceFile }}
44
{{- $settings = concat $settings (glob (joinPath .chezmoi.sourceDir ".chezmoitemplates/firefox/prefs/personal/*.js")) }}
5-
{{- else if regexMatch ".*enterprise/user\\.js\\.tmpl" .chezmoi.sourceFile }}
6-
{{- $settings = concat $settings (glob (joinPath .chezmoi.sourceDir ".chezmoitemplates/firefox/prefs/enterprise/*.js")) }}
5+
{{- else if regexMatch ".*enterprise-F1/user\\.js\\.tmpl" .chezmoi.sourceFile }}
6+
{{- $settings = concat $settings (glob (joinPath .chezmoi.sourceDir ".chezmoitemplates/firefox/prefs/enterprise-F1/*.js")) }}
77
{{- end }}
88
{{- if ne .browser "Z" }}
99
{{- $settings = concat $settings (list (joinPath .chezmoi.sourceDir ".chezmoitemplates/firefox/chrome/lepton/user.js")) }}

home/.chezmoitemplates/thunderbird/prefs/enterprise/02-extensions.js renamed to home/.chezmoitemplates/thunderbird/prefs/enterprise-F1/02-extensions.js

File renamed without changes.

home/.chezmoitemplates/thunderbird/user.js.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
{{- $settings := glob (joinPath .chezmoi.sourceDir ".chezmoitemplates/thunderbird/prefs/*.js") }}
33
{{- if regexMatch ".*personal/user\\.js\\.tmpl" .chezmoi.sourceFile }}
44
{{- $settings = concat $settings (glob (joinPath .chezmoi.sourceDir ".chezmoitemplates/thunderbird/prefs/personal/*.js")) }}
5-
{{- else if regexMatch ".*enterprise/user\\.js\\.tmpl" .chezmoi.sourceFile }}
6-
{{- $settings = concat $settings (glob (joinPath .chezmoi.sourceDir ".chezmoitemplates/thunderbird/prefs/enterprise/*.js")) }}
5+
{{- else if regexMatch ".*enterprise-F1/user\\.js\\.tmpl" .chezmoi.sourceFile }}
6+
{{- $settings = concat $settings (glob (joinPath .chezmoi.sourceDir ".chezmoitemplates/thunderbird/prefs/enterprise-F1/*.js")) }}
77
{{- end }}
88
{{- range ($settings) }}
99
{{- output "chezmoi" "execute-template" (include .) }}

home/dot_local/bin/executable_dybird.tmpl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ dybatpho::register_err_handler
2222
function _update_dotfiles {
2323
for profile in {{ range $profiles }}{{ . | quote }} {{ end }}; do
2424
if [ "$PROFILE" = "" ] || [ "$PROFILE" = "$profile" ]; then
25-
{{- if not (eq .kind "container" "vm") }}
2625
if dybatpho::is file ~/.config/thunderbird/profiles/${profile}/prefs.js; then
2726
dybatpho::progress "Update toolbar setting for profile ${profile}"
2827
grep "browser.uiCustomization.state" ~/.config/thunderbird/profiles/${profile}/prefs.js > {{ .chezmoi.sourceDir }}/.chezmoitemplates/thunderbird/prefs/${profile}/01-toolbar.js
@@ -32,7 +31,6 @@ function _update_dotfiles {
3231
grep "extensions.webextensions.ExtensionStorageIDB.migrated" ~/.config/thunderbird/profiles/${profile}/prefs.js >> {{ .chezmoi.sourceDir }}/.chezmoitemplates/thunderbird/prefs/${profile}/02-extensions.js || true
3332
grep "privacy.userContext.extension" ~/.config/thunderbird/profiles/${profile}/prefs.js >> {{ .chezmoi.sourceDir }}/.chezmoitemplates/thunderbird/prefs/${profile}/02-extensions.js || true
3433
fi
35-
{{- end }}
3634

3735
dybatpho::progress "Update extensions data for profile ${profile}"
3836
chezmoi add ~/.config/thunderbird/profiles/${profile}/extensions || true

0 commit comments

Comments
 (0)