Check-in [d6ffa09537]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Import latest changes from personal repo (README.md) - Regenerated using org v9.1.9 as found in GNU Emacs 26.1 (bashrc) - whitespace cleanups (emacs.d/init.el) - GGTags now requires Emacs 25.1 or greater - Install and configure htmlize - Customize sml/read-only-char based on window system (emacs.d/lisp/cmf-org-settings.el) - Add mood to journal entries - fixltx2e no longer required (prompts) - Add promptCMF256() (thirdparty/git-prompt) - Update to git v2.17.1
Timelines: family | ancestors | descendants | both | trunk | v2018.10.12
Files: files | file ages | folders
SHA1:d6ffa09537582b3433d531951ab95833b3e5c85e
User & Date: cfuhrman 2018-10-12 16:24:32
Context
2019-03-24
16:00
Sync Leaf check-in: f448cb6cd4 user: cfuhrman tags: trunk
2018-10-12
16:24
Import latest changes from personal repo (README.md) - Regenerated using org v9.1.9 as found in GNU Emacs 26.1 (bashrc) - whitespace cleanups (emacs.d/init.el) - GGTags now requires Emacs 25.1 or greater - Install and configure htmlize - Customize sml/read-only-char based on window system (emacs.d/lisp/cmf-org-settings.el) - Add mood to journal entries - fixltx2e no longer required (prompts) - Add promptCMF256() (thirdparty/git-prompt) - Update to git v2.17.1 check-in: d6ffa09537 user: cfuhrman tags: trunk, v2018.10.12
2018-08-06
21:46
Import latest changes from personal repo (GNUMakefile) - Set rsync(1) timeout to 30 seconds (bash_darwin) - Switch /usr/pkg to /opt/pkg to make installation easier (bashrc) - Make sure /opt/pkg/bin is before /usr/bin on MacOSX. Also, there is no need to have /opt/schily/bin twice in our path - Use an alias instead of GREP_OPTIONS as GREP_OPTIONS is now deprecated[1] (docs/README.org) - Note ShellPAK now support customization of GNU nano(1) editor - Update supported operating systems - It's OpenSUSE, not OpenSuSE - Add instructions for setting up pythong (emacs.d/init.el) - Add /opt/pkg/bin to cmf-path-list - Customize use-fancy-splash-screens-p for emacs version 24.5 (inclusive )-> 25.2.1 (exclusive) - Alignment fixes - Only customize height for when running Emacs under X-Windows - Add hooks via :hook declaration - Remove ac-ispell as it was causing too many issues to be useful - Remove popwin package as it was causing too many issues - Only install ace-window for emacs 24.4 and greater - Only install all-the-icons for emacs 24.4 and greater - Remove diff-mode customizations which were for popwin - Further customize flycheck - Only install gited for emacs 24.4 and greater - Bind gited-list-branches to C-c C-g - Swiper customizations for Emacs 26 - Install and configure markdown-mode - Install and configure org-fancy-priorities - Enable line up of cascading calls when editing PHP files - Set up Python development in Emacs - Add remote-url to VC-Fossil header - which-key requires Emacs 24.4 and greater - Customize org-crypt (emacs.d/shippets/sh-mode/bp) - Align copyright information (global-excludes) - Exclude the following from getting hosed: + .aggrev_defs + .python-environments + tramp (setup.sh) - Add support for customizing python environment (thirdparty/git-completion.bash, thirdparty/git-prompt) - Import git completion and prompt scripts from git v2.15.1 Footnotes: [1] https://www.gnu.org/software/grep/manual/grep.html#index-GREP_005fOPTIONS-environment-variable check-in: a690e0857b user: cfuhrman tags: trunk, v2018.08
Changes

Changes to README.md.

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
..
41
42
43
44
45
46
47



48
49
50
51
52
53
54



55
56
57
58
59
60
61
62
..
63
64
65
66
67
68
69



70
71
72
73
74
75
76
77
..
79
80
81
82
83
84
85



86
87
88
89
90
91
92
93
94
95
96
97
98



99
100
101
102
103
104
105
106
107
108



109
110
111
112
113
114
115
116
...
138
139
140
141
142
143
144
145




146
147
148
149
150
151




152
153
154



155
156
157
158
159
160
161
162

<div id="table-of-contents">
<h2>Table of Contents</h2>
<div id="text-table-of-contents">
<ul>
<li><a href="#sec-1">1. Description</a>
<ul>
<li><a href="#sec-1-1">1.1. Requirements</a></li>
<li><a href="#sec-1-2">1.2. Supported Platforms</a></li>
</ul>
</li>
<li><a href="#sec-2">2. Obtaining ShellPAK</a>
<ul>
<li><a href="#sec-2-1">2.1. Alternate Repositories</a></li>
</ul>
</li>
<li><a href="#sec-3">3. Installation</a>
<ul>
<li><a href="#sec-3-1">3.1. Other setup options</a></li>
</ul>
</li>
<li><a href="#sec-4">4. Bugs</a></li>
<li><a href="#sec-5">5. Author</a></li>
<li><a href="#sec-6">6. Copyright</a></li>
</ul>
</div>
</div>



# Description<a id="sec-1" name="sec-1"></a>

ShellPAK allows for the automatic installation and configuration of
my personal [GNU Bash](http://www.gnu.org/software/bash/) shell environment as well as the configuration
of the following programs:

-   [Git](http://git-scm.com)
-   [GNU Emacs](http://www.gnu.org/software/emacs/)
................................................................................
-   [mg Text Editor](http://homepage.boetes.org/software/mg/)
-   [Perl::Tidy](http://search.cpan.org/~shancock/Perl-Tidy-20140711/lib/Perl/Tidy.pod)
-   [tmux](http://tmux.sourceforge.net)

This code is specific to my own needs and is here in the hopes it
will be useful as a reference.




## Requirements<a id="sec-1-1" name="sec-1-1"></a>

-   GNU Bash version 3.2 or greater
-   GNU Emacs 24.1 or greater (Emacs 24.4 or greater preferred)
-   GNU Make
-   rsync




## Supported Platforms<a id="sec-1-2" name="sec-1-2"></a>

The following operating systems are known to be supported:

-   Mac OS X 10.13 (Darwin)
-   NetBSD 6.1.x
-   OpenBSD 5.8
-   CentOS 6.5
................................................................................
-   Debian 9 (Stretch) and derivatives
-   SunOS solaris 5.10
-   AIX 1 7

In addition, ShellPAK has been known to run on OpenSUSE, SuSE
Enterprise Linux, Ubuntu, FreeBSD, and Cygwin.




# Obtaining ShellPAK<a id="sec-2" name="sec-2"></a>

As of <span class="timestamp-wrapper"><span class="timestamp">&lt;2014-07-30 Wed&gt;</span></span>, [ShellPAK](https://chiselapp.com/user/cfuhrman/repository/shpak/home) is managed by the [Fossil](http://fossil-scm.org)
distributed version control system.  To check out a repository:

    # Clone the repository
    $ fossil clone https://chiselapp.com/user/cfuhrman/repository/shpak ~/shellpak.fossil
    
................................................................................
    $ mkdir shellpak
    $ cd shellpak
    $ fossil open ~/shellpak.fossil

Further information on Fossil can be found at this [Quick Start
Guide](http://www.fossil-scm.org/index.html/doc/trunk/www/quickstart.wiki).




## Alternate Repositories<a id="sec-2-1" name="sec-2-1"></a>

[ShellPAK](https://chiselapp.com/user/cfuhrman/repository/shpak/home) is also available for checkout from the following
locations:

-   **Git:** [GitHub](https://github.com/cfuhrman/shpak), [BitBucket](https://bitbucket.org/chrisfuhrman/shellpak)
-   **Fossil:** [FuhrWerks](https://fossil.fuhrwerks.com/shpak)
-   **Bazaar:** [Launchpad](https://code.launchpad.net/~cfuhrman/shpak/trunk)

Be aware that portions of the ShellPAK infrastructure relies on
Fossil.  Conversion to support the conventions of an alternative
revision control system is an exercise left to the user.




# Installation<a id="sec-3" name="sec-3"></a>

    # Install ShellPAK
    $ ./setup.sh

Note that during installation, ShellPAK will store dot-files (e.g.,
`bashrc`, `bash_profile`, etc) in `~/Backup/shell` (or whatever is
specified by the `-b` flag).  These files will be restored during
un-installation (via the `-u` flag)




## Other setup options<a id="sec-3-1" name="sec-3-1"></a>

    # Perform a dry-run
    $ ./setup.sh -r
    
    # Install into another directory
    $ ./setup.sh -d /path/to/directory
    
................................................................................
    # List runtime options
    $ ./setup.sh -h

Previous versions of `setup.sh` provided options for installation
of Emacs packages.  This is no longer required as Emacs will now
automatically install necessary packages on startup.

# Bugs<a id="sec-4" name="sec-4"></a>





Please report any bugs or feature requests by [filing a ticket](https://chiselapp.com/user/cfuhrman/repository/shpak/reportlist) via
the ShellPAK repository website.

# Author<a id="sec-5" name="sec-5"></a>





Christopher M. Fuhrman
[cfuhrman@pobox.com](cfuhrman@pobox.com)




# Copyright<a id="sec-6" name="sec-6"></a>

Copyright (c) 2000-2018 Christopher M. Fuhrman
All rights reserved.

All files contained herein can be redistributed and/or modified
under the terms of the Simplified BSD License (also known as the
"2-Clause License" or "FreeBSD License".) unless otherwise noted.

|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<
<
<
<
<
<
<
<
<
<
<







 







>
>
>
|






>
>
>
|







 







>
>
>
|







 







>
>
>
|












>
>
>
|









>
>
>
|







 







<
>
>
>
>




<

>
>
>
>

|

>
>
>
|







>
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19











20
21
22
23
24
25
26
..
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
..
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
..
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
...
145
146
147
148
149
150
151

152
153
154
155
156
157
158
159

160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179

# Table of Contents

1.  [Description](#orgca81bf4)
    1.  [Requirements](#org2c768cc)
    2.  [Supported Platforms](#org43c250a)
2.  [Obtaining ShellPAK](#orgb072061)
    1.  [Alternate Repositories](#org822ffdf)
3.  [Installation](#org7a04f13)
    1.  [Other setup options](#orga848fba)
4.  [Bugs](#orga13e6aa)
5.  [Author](#org19bcca2)
6.  [Copyright](#org994c8f3)



<a id="orgca81bf4"></a>

# Description












ShellPAK allows for the automatic installation and configuration of
my personal [GNU Bash](http://www.gnu.org/software/bash/) shell environment as well as the configuration
of the following programs:

-   [Git](http://git-scm.com)
-   [GNU Emacs](http://www.gnu.org/software/emacs/)
................................................................................
-   [mg Text Editor](http://homepage.boetes.org/software/mg/)
-   [Perl::Tidy](http://search.cpan.org/~shancock/Perl-Tidy-20140711/lib/Perl/Tidy.pod)
-   [tmux](http://tmux.sourceforge.net)

This code is specific to my own needs and is here in the hopes it
will be useful as a reference.


<a id="org2c768cc"></a>

## Requirements

-   GNU Bash version 3.2 or greater
-   GNU Emacs 24.1 or greater (Emacs 24.4 or greater preferred)
-   GNU Make
-   rsync


<a id="org43c250a"></a>

## Supported Platforms

The following operating systems are known to be supported:

-   Mac OS X 10.13 (Darwin)
-   NetBSD 6.1.x
-   OpenBSD 5.8
-   CentOS 6.5
................................................................................
-   Debian 9 (Stretch) and derivatives
-   SunOS solaris 5.10
-   AIX 1 7

In addition, ShellPAK has been known to run on OpenSUSE, SuSE
Enterprise Linux, Ubuntu, FreeBSD, and Cygwin.


<a id="orgb072061"></a>

# Obtaining ShellPAK

As of <span class="timestamp-wrapper"><span class="timestamp">&lt;2014-07-30 Wed&gt;</span></span>, [ShellPAK](https://chiselapp.com/user/cfuhrman/repository/shpak/home) is managed by the [Fossil](http://fossil-scm.org)
distributed version control system.  To check out a repository:

    # Clone the repository
    $ fossil clone https://chiselapp.com/user/cfuhrman/repository/shpak ~/shellpak.fossil
    
................................................................................
    $ mkdir shellpak
    $ cd shellpak
    $ fossil open ~/shellpak.fossil

Further information on Fossil can be found at this [Quick Start
Guide](http://www.fossil-scm.org/index.html/doc/trunk/www/quickstart.wiki).


<a id="org822ffdf"></a>

## Alternate Repositories

[ShellPAK](https://chiselapp.com/user/cfuhrman/repository/shpak/home) is also available for checkout from the following
locations:

-   **Git:** [GitHub](https://github.com/cfuhrman/shpak), [BitBucket](https://bitbucket.org/chrisfuhrman/shellpak)
-   **Fossil:** [FuhrWerks](https://fossil.fuhrwerks.com/shpak)
-   **Bazaar:** [Launchpad](https://code.launchpad.net/~cfuhrman/shpak/trunk)

Be aware that portions of the ShellPAK infrastructure relies on
Fossil.  Conversion to support the conventions of an alternative
revision control system is an exercise left to the user.


<a id="org7a04f13"></a>

# Installation

    # Install ShellPAK
    $ ./setup.sh

Note that during installation, ShellPAK will store dot-files (e.g.,
`bashrc`, `bash_profile`, etc) in `~/Backup/shell` (or whatever is
specified by the `-b` flag).  These files will be restored during
un-installation (via the `-u` flag)


<a id="orga848fba"></a>

## Other setup options

    # Perform a dry-run
    $ ./setup.sh -r
    
    # Install into another directory
    $ ./setup.sh -d /path/to/directory
    
................................................................................
    # List runtime options
    $ ./setup.sh -h

Previous versions of `setup.sh` provided options for installation
of Emacs packages.  This is no longer required as Emacs will now
automatically install necessary packages on startup.



<a id="orga13e6aa"></a>

# Bugs

Please report any bugs or feature requests by [filing a ticket](https://chiselapp.com/user/cfuhrman/repository/shpak/reportlist) via
the ShellPAK repository website.



<a id="org19bcca2"></a>

# Author

Christopher M. Fuhrman
[cfuhrman@pobox.com](mailto:cfuhrman@pobox.com)


<a id="org994c8f3"></a>

# Copyright

Copyright (c) 2000-2018 Christopher M. Fuhrman
All rights reserved.

All files contained herein can be redistributed and/or modified
under the terms of the Simplified BSD License (also known as the
"2-Clause License" or "FreeBSD License".) unless otherwise noted.

Changes to bashrc.

325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
# Alias for fossil
if type -p fossil >/dev/null; then
        alias fl="fossil"
fi

# Aliases for PHP CodeSniffer
if type -p phpcs >/dev/null; then
	alias phpcs='phpcs --standard=PSR2'
fi

if type -p phpcbf >/dev/null; then
	alias phpcbf='phpcbf --standard=PSR2'
fi

# GREP_OPTIONS is deprecated, so here is a work-around
alias grep="grep ${CMF_GREP_OPTIONS}"

# Program defaults
# --------------------------------------------------------------------







|



|







325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
# Alias for fossil
if type -p fossil >/dev/null; then
        alias fl="fossil"
fi

# Aliases for PHP CodeSniffer
if type -p phpcs >/dev/null; then
       alias phpcs='phpcs --standard=PSR2'
fi

if type -p phpcbf >/dev/null; then
       alias phpcbf='phpcbf --standard=PSR2'
fi

# GREP_OPTIONS is deprecated, so here is a work-around
alias grep="grep ${CMF_GREP_OPTIONS}"

# Program defaults
# --------------------------------------------------------------------

Changes to emacs.d/init.el.

639
640
641
642
643
644
645


646
647
648
649
650
651
652
653
654
655
656
657
658
659
...
683
684
685
686
687
688
689






690
691
692
693
694
695
696
...
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
...
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
....
1034
1035
1036
1037
1038
1039
1040
1041

1042
1043
1044

1045
1046
1047


1048


1049
1050
1051
1052
1053
1054
1055
	   ("C-c C-g" . gited-list-branches)
	   )

    )
  )

;; ggtags


(use-package ggtags
  :ensure t

  :diminish ggtags-mode " πŸ„Ά"

  :hook (prog-mode . ggtags-mode)

  )

;; go-mode
(use-package go-mode
  :ensure t
  :ensure go-autocomplete
  :ensure go-direx
................................................................................
  (global-highlight-parentheses-mode)
  )

;; html-mode
(use-package html-mode
  :mode ("\\.tmpl\\'" . html-mode)
  )







;; ivy
(use-package ivy
  :ensure counsel
  :ensure swiper
  :diminish ivy-mode

................................................................................
  :mode ("[Mm]akefile\\." . makefile-mode)
  )

;; markdown-mode
(use-package markdown-mode
  :ensure t
  :pin melpa-stable
  
  :commands (markdown-mode gfm-mode)

  :mode (("README\\.md\\'"	 . gfm-mode)
         ("\\.md\\'"		 . markdown-mode)
         ("\\.markdown\\'"	 . markdown-mode))

  :init (setq markdown-command "multimarkdown")
................................................................................
  :init
  (require 'org-install)
  (require 'org-bullets)
  (require 'org-crypt)

  ;; Enable org-crypt as appropriate
  (org-crypt-use-before-save-magic)
 
  :config
  (use-package org-fancy-priorities
    :ensure t

    :diminish " πŸ„΅"

    :hook
................................................................................
  :ensure t

  :init
  (setq sml/no-confirm-load-theme t)
  (sml/setup)

  :config
  (if (equal window-system nil)

      (progn
	(sml/apply-theme 'dark)
	(setq sml/read-only-char " πŸ”’"))

    (progn
      (sml/apply-theme 'dark)
      (setq sml/read-only-char " πŸ…›"))


    (sml/apply-theme 'respectful))



  :custom
  (sml/modified-char "β˜…")
  )

;; sql
(use-package sql







>
>
|
|
<
|
<
|
|







 







>
>
>
>
>
>







 







|







 







|







 







|
>
|
|
|
>
|
|
|
>
>
|
>
>







639
640
641
642
643
644
645
646
647
648
649

650

651
652
653
654
655
656
657
658
659
...
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
...
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
...
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
....
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
	   ("C-c C-g" . gited-list-branches)
	   )

    )
  )

;; ggtags
(if (version< emacs-version "25.1")
    (message "GGTags requires Emacs version 25.1 or greater.  Unable to install")
  (use-package ggtags
    :ensure t

    :diminish ggtags-mode " πŸ„Ά"

    :hook (prog-mode . ggtags-mode)
    )
  )

;; go-mode
(use-package go-mode
  :ensure t
  :ensure go-autocomplete
  :ensure go-direx
................................................................................
  (global-highlight-parentheses-mode)
  )

;; html-mode
(use-package html-mode
  :mode ("\\.tmpl\\'" . html-mode)
  )

;; htmlize
(use-package htmlize
  :ensure t
  :pin melpa-stable
)

;; ivy
(use-package ivy
  :ensure counsel
  :ensure swiper
  :diminish ivy-mode

................................................................................
  :mode ("[Mm]akefile\\." . makefile-mode)
  )

;; markdown-mode
(use-package markdown-mode
  :ensure t
  :pin melpa-stable

  :commands (markdown-mode gfm-mode)

  :mode (("README\\.md\\'"	 . gfm-mode)
         ("\\.md\\'"		 . markdown-mode)
         ("\\.markdown\\'"	 . markdown-mode))

  :init (setq markdown-command "multimarkdown")
................................................................................
  :init
  (require 'org-install)
  (require 'org-bullets)
  (require 'org-crypt)

  ;; Enable org-crypt as appropriate
  (org-crypt-use-before-save-magic)

  :config
  (use-package org-fancy-priorities
    :ensure t

    :diminish " πŸ„΅"

    :hook
................................................................................
  :ensure t

  :init
  (setq sml/no-confirm-load-theme t)
  (sml/setup)

  :config
  (pcase (window-system)
    ('ns
     (progn
       (sml/apply-theme 'respectful)
       (setq sml/read-only-char " πŸ…›")))
    ('nil
     (progn
       (sml/apply-theme 'dark)
       (setq sml/read-only-char " πŸ”’")))
    (window-system
     (progn
       (sml/apply-theme 'respectful)
       (setq sml/read-only-char " πŸ”’"))
    ))

  :custom
  (sml/modified-char "β˜…")
  )

;; sql
(use-package sql

Changes to emacs.d/lisp/cmf-org-settings.el.

106
107
108
109
110
111
112

113
114
115
116
117
118
119
120
...
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
  Context: %a

  %?" :empty-lines 1)
     ("j" "Journal Entry" entry
      (file+datetree "~/org/journal.org")
      "** %^{Heading} :JOURNAL:%^G
  Added: %U


  %?" :empty-lines 1)
     ("B" "Blood Pressure Log Entry" table-line
      (file+headline "~/org/journal.org" "Blood Pressure Log")
      "| %^u | %^{Systolic} | %^{Diastolic} |")
     ("E" "Household Expense" table-line
      (file+headline "~/org/journal.org" "Household Expenses")
      "| %^u | %^{Vendor} | %^{Description} | %^{Cost} |")
................................................................................
      ("\\section{%s}" . "\\section*{%s}")
      ("\\subsection{%s}" . "\\subsection*{%s}")
      ("\\subsubsection{%s}" . "\\subsubsection*{%s}")))))
 '(org-latex-default-packages-alist
   (quote
    (("AUTO" "inputenc" t)
     ("T1" "fontenc" t)
     ("" "fixltx2e" nil)
     ("" "graphicx" t)
     ("" "longtable" nil)
     ("" "float" nil)
     ("" "wrapfig" nil)
     ("" "rotating" nil)
     ("normalem" "ulem" t)
     ("" "amsmath" t)







>
|







 







<







106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
...
176
177
178
179
180
181
182

183
184
185
186
187
188
189
  Context: %a

  %?" :empty-lines 1)
     ("j" "Journal Entry" entry
      (file+datetree "~/org/journal.org")
      "** %^{Heading} :JOURNAL:%^G
  Added: %U
  Mood: %^{mood}
  
  %?" :empty-lines 1)
     ("B" "Blood Pressure Log Entry" table-line
      (file+headline "~/org/journal.org" "Blood Pressure Log")
      "| %^u | %^{Systolic} | %^{Diastolic} |")
     ("E" "Household Expense" table-line
      (file+headline "~/org/journal.org" "Household Expenses")
      "| %^u | %^{Vendor} | %^{Description} | %^{Cost} |")
................................................................................
      ("\\section{%s}" . "\\section*{%s}")
      ("\\subsection{%s}" . "\\subsection*{%s}")
      ("\\subsubsection{%s}" . "\\subsubsection*{%s}")))))
 '(org-latex-default-packages-alist
   (quote
    (("AUTO" "inputenc" t)
     ("T1" "fontenc" t)

     ("" "graphicx" t)
     ("" "longtable" nil)
     ("" "float" nil)
     ("" "wrapfig" nil)
     ("" "rotating" nil)
     ("normalem" "ulem" t)
     ("" "amsmath" t)

Changes to prompts.

31
32
33
34
35
36
37


38
39
40
41
42
43
44
..
82
83
84
85
86
87
88











89
90
91
92
93
94
95
RED='\[\033[0;31m\]'
GREEN='\[\033[0;32m\]'
YELLOW='\[\033[0;33m\]'
BLUE='\[\033[0;34m\]'
PURPLE='\[\033[0;35m\]'
WHITE='\[\033[0;37m\]'
CYAN='\[\033[0;36m\]'



# Make sure GNU echo is used (especially under Solaris!)
if [ -e /usr/gnu/bin/echo ]; then
        ECHO='/usr/gnu/bin/echo'
else
        ECHO='echo'
fi
................................................................................
        DEFAULTPS1=$PS1
        PS1=${BLACK_BACKGROUND}${BRIGHT_BLUE}'[ '${BRIGHT_YELLOW}'\h'${BRIGHT_BLUE}'-'${BRIGHT_WHITE}'\@'${BRIGHT_BLUE}' ]-'${BRIGHT_YELLOW}'\W '${CYAN}'$(__git_ps1 "(%s) ")'${BLACK_BACKGROUND}${BRIGHT_WHITE}'\$'${NO_COLOR}' '
        PS2='> '
        PS4='+ '

        export DEFAULTPS1
}                                                 # promptCMF()












# Function: promptDefault
#
# Method that uses whatever default prompt is used by the
# current system

promptDefault ()







>
>







 







>
>
>
>
>
>
>
>
>
>
>







31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
..
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
RED='\[\033[0;31m\]'
GREEN='\[\033[0;32m\]'
YELLOW='\[\033[0;33m\]'
BLUE='\[\033[0;34m\]'
PURPLE='\[\033[0;35m\]'
WHITE='\[\033[0;37m\]'
CYAN='\[\033[0;36m\]'
LIGHT_BLUE='\033[38;5;104m\]'
LIGHT_YELLOW='\[\033[38;5;228m\]'

# Make sure GNU echo is used (especially under Solaris!)
if [ -e /usr/gnu/bin/echo ]; then
        ECHO='/usr/gnu/bin/echo'
else
        ECHO='echo'
fi
................................................................................
        DEFAULTPS1=$PS1
        PS1=${BLACK_BACKGROUND}${BRIGHT_BLUE}'[ '${BRIGHT_YELLOW}'\h'${BRIGHT_BLUE}'-'${BRIGHT_WHITE}'\@'${BRIGHT_BLUE}' ]-'${BRIGHT_YELLOW}'\W '${CYAN}'$(__git_ps1 "(%s) ")'${BLACK_BACKGROUND}${BRIGHT_WHITE}'\$'${NO_COLOR}' '
        PS2='> '
        PS4='+ '

        export DEFAULTPS1
}                                                 # promptCMF()

# Function: promptCMF256()
#
# Sets up prompt using 256 colors

promptCMF256 ()
{
	doXTerm
	DEFAULTPS1=$PS1
	PS1=${BLACK_BACKGROUND}${LIGHT_BLUE}'[ '${LIGHT_YELLOW}'\h'${LIGHT_BLUE}'-'${BRIGHT_WHITE}'\@'${LIGHT_BLUE}' ]-'${LIGHT_YELLOW}'\W '${CYAN}'$(__git_ps1 "(%s) ")'${BLACK_BACKGROUND}${BRIGHT_WHITE}'\$'${NO_COLOR}' '
}

# Function: promptDefault
#
# Method that uses whatever default prompt is used by the
# current system

promptDefault ()

Changes to thirdparty/git-prompt.sh.

274
275
276
277
278
279
280



281
282
283
284
285

286
287
288
289
290
291
292
	fi
	if [ -n "$u" ]; then
		u="$bad_color$u"
	fi
	r="$c_clear$r"
}




__git_eread ()
{
	local f="$1"
	shift
	test -r "$f" && read "$@" <"$f"

}

# __git_ps1 accepts 0 or 1 arguments (i.e., format string)
# when called from PS1 using command substitution
# in this mode it prints text to add to bash PS1 prompt (includes branch name)
#
# __git_ps1 requires 2 or 3 arguments when called from PROMPT_COMMAND (pc)







>
>
>


<
<
<
>







274
275
276
277
278
279
280
281
282
283
284
285



286
287
288
289
290
291
292
293
	fi
	if [ -n "$u" ]; then
		u="$bad_color$u"
	fi
	r="$c_clear$r"
}

# Helper function to read the first line of a file into a variable.
# __git_eread requires 2 arguments, the file path and the name of the
# variable, in that order.
__git_eread ()
{



	test -r "$1" && IFS=$'\r\n' read "$2" <"$1"
}

# __git_ps1 accepts 0 or 1 arguments (i.e., format string)
# when called from PS1 using command substitution
# in this mode it prints text to add to bash PS1 prompt (includes branch name)
#
# __git_ps1 requires 2 or 3 arguments when called from PROMPT_COMMAND (pc)