[base-files - A set of important system configuration and setup files] branch master, updated. 4.3-1-5-ga9c82c5
Achim Gratz
gratz@sourceware.org
Sun Apr 25 11:52:53 GMT 2021
https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/base-files.git;h=a9c82c522e7d86fd548354d2e74f468751d24397
commit a9c82c522e7d86fd548354d2e74f468751d24397
Author: Achim Gratz <Stromeko@Stromeko.DE>
Date: Sun Apr 25 13:41:33 2021 +0200
Bump version to 4.3-3
https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/base-files.git;h=b084ff2c032b8d5eb6cf13641bb9e40997a7c382
commit b084ff2c032b8d5eb6cf13641bb9e40997a7c382
Author: Achim Gratz <Stromeko@Stromeko.DE>
Date: Sat Apr 24 21:00:58 2021 +0200
fix a bug so that CYGWIN_USEWINPATH actually does what it was supposed to do
https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/base-files.git;h=c9a377202eb6d231f0cec450abc575487a1217f4
commit c9a377202eb6d231f0cec450abc575487a1217f4
Author: Achim Gratz <Stromeko@Stromeko.DE>
Date: Sat Sep 17 12:02:50 2016 +0200
Bump version to 4.3-2
https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/base-files.git;h=aa88c10c037d989e7ac4616d306a94b7db4115f5
commit aa88c10c037d989e7ac4616d306a94b7db4115f5
Author: Achim Gratz <Stromeko@Stromeko.DE>
Date: Sat Sep 17 11:59:56 2016 +0200
fix default file installation and remove outdated completion otpions from skel/.bashrc
https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/base-files.git;h=248f7418303b975dcfac798e41334d282f7ed926
commit 248f7418303b975dcfac798e41334d282f7ed926
Author: Achim Gratz <Stromeko@Stromeko.DE>
Date: Sat Sep 3 14:35:38 2016 +0200
make Cygwin.bat executable and move to /etc/defaults
(fixed in cygport for the release of 4.3-1)
Diff:
---
Cygwin.bat => etc/defaults/Cygwin.bat | 0
etc/defaults/etc/bash.bash_logout | 2 +-
etc/defaults/etc/bash.bashrc | 2 +-
etc/defaults/etc/profile | 5 +--
etc/defaults/etc/profile.d/lang.csh | 2 +-
etc/defaults/etc/profile.d/lang.sh | 2 +-
etc/defaults/etc/profile.d/tzset.csh | 2 +-
etc/defaults/etc/profile.d/tzset.sh | 2 +-
etc/defaults/etc/skel/.bash_profile | 2 +-
etc/defaults/etc/skel/.bashrc | 62 ++++++++++++++---------------------
etc/defaults/etc/skel/.inputrc | 2 +-
etc/defaults/etc/skel/.profile | 2 +-
etc/postinstall/base-files-mketc.sh | 2 +-
etc/postinstall/base-files-profile.sh | 24 +++++++-------
etc/preremove/base-files.sh | 2 +-
usr/share/doc/base-files/ChangeLog | 18 ++++++++--
16 files changed, 68 insertions(+), 63 deletions(-)
diff --git a/Cygwin.bat b/etc/defaults/Cygwin.bat
old mode 100644
new mode 100755
similarity index 100%
rename from Cygwin.bat
rename to etc/defaults/Cygwin.bat
diff --git a/etc/defaults/etc/bash.bash_logout b/etc/defaults/etc/bash.bash_logout
index 35f97cc..c4b5f9a 100644
--- a/etc/defaults/etc/bash.bash_logout
+++ b/etc/defaults/etc/bash.bash_logout
@@ -5,7 +5,7 @@
# with this software.
# If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
-# base-files version 4.3-1
+# base-files version 4.3-3
# /etc/bash.bash_logout: executed by bash(1) when login shell exits.
diff --git a/etc/defaults/etc/bash.bashrc b/etc/defaults/etc/bash.bashrc
index 0f633fa..9b100f9 100644
--- a/etc/defaults/etc/bash.bashrc
+++ b/etc/defaults/etc/bash.bashrc
@@ -5,7 +5,7 @@
# with this software.
# If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
-# base-files version 4.3-1
+# base-files version 4.3-3
# /etc/bash.bashrc: executed by bash(1) for interactive shells.
diff --git a/etc/defaults/etc/profile b/etc/defaults/etc/profile
index c9ea9c9..483fa10 100755
--- a/etc/defaults/etc/profile
+++ b/etc/defaults/etc/profile
@@ -1,3 +1,4 @@
+# -*- mode:sh sh-shell:sh -*-
# To the extent possible under law, the author(s) have dedicated all
# copyright and related and neighboring rights to this software to the
# public domain worldwide. This software is distributed without any warranty.
@@ -5,7 +6,7 @@
# with this software.
# If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
-# base-files version 4.3-1
+# base-files version 4.3-3
# /etc/profile: executed by the command interpreter for login shells.
@@ -36,7 +37,7 @@ if [ -z "${PROFILEREAD+true}" ] ; then
# setting CYGWIN_USEWINPATH non-empty in the system variables
# assumes that you've already set up PATH so that Cygwin works
# correctly -- no further alteration is done
- if [ ${CYGWIN_USEWINPATH-nopathprepend} ] ; then
+ if [ ${CYGWIN_USEWINPATH-pathprepend} = "pathprepend" ] ; then
# setting CYGWIN_NOWINPATH non-empty in the system variables
# prevents use of the existing PATH and a clean PATH just for
# Cygwin is set up -- you need to add any extra path components
diff --git a/etc/defaults/etc/profile.d/lang.csh b/etc/defaults/etc/profile.d/lang.csh
index ada590b..43da4e9 100644
--- a/etc/defaults/etc/profile.d/lang.csh
+++ b/etc/defaults/etc/profile.d/lang.csh
@@ -5,7 +5,7 @@
# with this software.
# If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
-# base-files version 4.3-1
+# base-files version 4.3-3
# /etc/profile.d/lang.csh: sourced by /etc/profile.
diff --git a/etc/defaults/etc/profile.d/lang.sh b/etc/defaults/etc/profile.d/lang.sh
index 1cbe96b..005a90f 100644
--- a/etc/defaults/etc/profile.d/lang.sh
+++ b/etc/defaults/etc/profile.d/lang.sh
@@ -5,7 +5,7 @@
# with this software.
# If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
-# base-files version 4.3-1
+# base-files version 4.3-3
# /etc/profile.d/lang.sh: sourced by /etc/profile.
diff --git a/etc/defaults/etc/profile.d/tzset.csh b/etc/defaults/etc/profile.d/tzset.csh
index 520d58b..8c3d710 100644
--- a/etc/defaults/etc/profile.d/tzset.csh
+++ b/etc/defaults/etc/profile.d/tzset.csh
@@ -5,7 +5,7 @@
# with this software.
# If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
-# base-files version 4.3-1
+# base-files version 4.3-3
# /etc/profile.d/tzset.csh: sourced by /etc/profile.
diff --git a/etc/defaults/etc/profile.d/tzset.sh b/etc/defaults/etc/profile.d/tzset.sh
index 18516ba..c1fd914 100644
--- a/etc/defaults/etc/profile.d/tzset.sh
+++ b/etc/defaults/etc/profile.d/tzset.sh
@@ -5,7 +5,7 @@
# with this software.
# If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
-# base-files version 4.3-1
+# base-files version 4.3-3
# /etc/profile.d/tzset.sh: sourced by /etc/profile.
diff --git a/etc/defaults/etc/skel/.bash_profile b/etc/defaults/etc/skel/.bash_profile
index 1e23df0..84701e7 100644
--- a/etc/defaults/etc/skel/.bash_profile
+++ b/etc/defaults/etc/skel/.bash_profile
@@ -5,7 +5,7 @@
# with this software.
# If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
-# base-files version 4.3-1
+# base-files version 4.3-3
# ~/.bash_profile: executed by bash(1) for login shells.
diff --git a/etc/defaults/etc/skel/.bashrc b/etc/defaults/etc/skel/.bashrc
index 8b9605b..3a4f59a 100644
--- a/etc/defaults/etc/skel/.bashrc
+++ b/etc/defaults/etc/skel/.bashrc
@@ -1,11 +1,11 @@
-# To the extent possible under law, the author(s) have dedicated all
-# copyright and related and neighboring rights to this software to the
-# public domain worldwide. This software is distributed without any warranty.
-# You should have received a copy of the CC0 Public Domain Dedication along
-# with this software.
-# If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
+# To the extent possible under law, the author(s) have dedicated all
+# copyright and related and neighboring rights to this software to the
+# public domain worldwide. This software is distributed without any warranty.
+# You should have received a copy of the CC0 Public Domain Dedication along
+# with this software.
+# If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
-# base-files version 4.3-1
+# base-files version 4.3-3
# ~/.bashrc: executed by bash(1) for interactive shells.
@@ -46,22 +46,10 @@
# for example, cd /vr/lgo/apaache would find /var/log/apache
# shopt -s cdspell
-# Completion options
-#
-# These completion tuning parameters change the default behavior of bash_completion:
-#
-# Define to access remotely checked-out files over passwordless ssh for CVS
-# COMP_CVS_REMOTE=1
-#
-# Define to avoid stripping description in --option=description of './configure --help'
-# COMP_CONFIGURE_HINTS=1
-#
-# Define to avoid flattening internal contents of tar files
-# COMP_TAR_INTERNAL_PATHS=1
-#
-# Uncomment to turn on programmable completion enhancements.
-# Any completions you add in ~/.bash_completion are sourced last.
-# [[ -f /etc/bash_completion ]] && . /etc/bash_completion
+# Programmable completion enhancements are enabled via
+# /etc/profile.d/bash_completion.sh when the package bash_completetion
+# is installed. Any completions you add in ~/.bash_completion are
+# sourced last.
# History Options
#
@@ -132,13 +120,13 @@
# Some example functions:
#
# a) function settitle
-# settitle ()
-# {
-# echo -ne "\e]2;$@\a\e]1;$@\a";
+# settitle ()
+# {
+# echo -ne "\e]2;$@\a\e]1;$@\a";
# }
-#
+#
# b) function cd_func
-# This function defines a 'cd' replacement function capable of keeping,
+# This function defines a 'cd' replacement function capable of keeping,
# displaying and accessing history of visited directories, up to 10 entries.
# To use it, uncomment it, source this file and try 'cd --'.
# acd_func 1.0.5, 10-nov-2004
@@ -147,15 +135,15 @@
# {
# local x2 the_new_dir adir index
# local -i cnt
-#
+#
# if [[ $1 == "--" ]]; then
# dirs -v
# return 0
# fi
-#
+#
# the_new_dir=$1
# [[ -z $1 ]] && the_new_dir=$HOME
-#
+#
# if [[ ${the_new_dir:0:1} == '-' ]]; then
# #
# # Extract dir N from dirs
@@ -165,21 +153,21 @@
# [[ -z $adir ]] && return 1
# the_new_dir=$adir
# fi
-#
+#
# #
# # '~' has to be substituted by ${HOME}
# [[ ${the_new_dir:0:1} == '~' ]] && the_new_dir="${HOME}${the_new_dir:1}"
-#
+#
# #
# # Now change to the new dir and add to the top of the stack
# pushd "${the_new_dir}" > /dev/null
# [[ $? -ne 0 ]] && return 1
# the_new_dir=$(pwd)
-#
+#
# #
# # Trim down everything beyond 11th entry
# popd -n +11 2>/dev/null 1>/dev/null
-#
+#
# #
# # Remove any other occurence of this dir, skipping the top of the stack
# for ((cnt=1; cnt <= 10; cnt++)); do
@@ -191,8 +179,8 @@
# cnt=cnt-1
# fi
# done
-#
+#
# return 0
# }
-#
+#
# alias cd=cd_func
diff --git a/etc/defaults/etc/skel/.inputrc b/etc/defaults/etc/skel/.inputrc
index 9231c22..efc1050 100644
--- a/etc/defaults/etc/skel/.inputrc
+++ b/etc/defaults/etc/skel/.inputrc
@@ -5,7 +5,7 @@
# with this software.
# If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
-# base-files version 4.3-1
+# base-files version 4.3-3
# ~/.inputrc: readline initialization file.
diff --git a/etc/defaults/etc/skel/.profile b/etc/defaults/etc/skel/.profile
index 84fe5c1..02bb0d9 100644
--- a/etc/defaults/etc/skel/.profile
+++ b/etc/defaults/etc/skel/.profile
@@ -5,7 +5,7 @@
# with this software.
# If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
-# base-files version 4.3-1
+# base-files version 4.3-3
# ~/.profile: executed by the command interpreter for login shells.
diff --git a/etc/postinstall/base-files-mketc.sh b/etc/postinstall/base-files-mketc.sh
index 28127d3..ee85411 100755
--- a/etc/postinstall/base-files-mketc.sh
+++ b/etc/postinstall/base-files-mketc.sh
@@ -6,7 +6,7 @@
# with this software.
# If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
-# base-files version 4.3-1
+# base-files version 4.3-3
# Create symbolic links from some /etc files to the Windows equivalents
# Set perms to /tmp directory
diff --git a/etc/postinstall/base-files-profile.sh b/etc/postinstall/base-files-profile.sh
index 40cd2ac..a19effa 100755
--- a/etc/postinstall/base-files-profile.sh
+++ b/etc/postinstall/base-files-profile.sh
@@ -1,12 +1,12 @@
#!/usr/bin/sh
-# To the extent possible under law, the author(s) have dedicated all
-# copyright and related and neighboring rights to this software to the
-# public domain worldwide. This software is distributed without any warranty.
-# You should have received a copy of the CC0 Public Domain Dedication along
-# with this software.
-# If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
+# To the extent possible under law, the author(s) have dedicated all
+# copyright and related and neighboring rights to this software to the
+# public domain worldwide. This software is distributed without any warranty.
+# You should have received a copy of the CC0 Public Domain Dedication along
+# with this software.
+# If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
-# base-files version 4.3-1
+# base-files version 4.3-3
MANIFEST="/etc/preremove/base-files-manifest.lst"
@@ -15,13 +15,15 @@ MANIFEST="/etc/preremove/base-files-manifest.lst"
while read f; do
fSrc="/etc/defaults/${f}"
fDest="/${f}"
- if [ ! -e ${fDest} -a ! -L ${fDest} ]; then
- echo "Using the default version of ${fDest} (${fSrc})"
+ if [ ! -e ${fDest} ]; then
+ echo "Installing the default version of ${fDest} from ${fSrc}."
/usr/bin/mkdir -p $(dirname ${fDest})
- /usr/bin/touch ${fDest}
/usr/bin/cp ${fSrc} ${fDest}
else
- echo "${fDest} is already in existence, not overwriting."
+ echo "Not installing the default version of ${fDest} (default is in ${fSrc})."
+ if [ -f ${fDest} -a -x /bin/diff ]; then
+ /bin/diff -wut ${fDest} ${fSrc}
+ fi
fi
done < ${MANIFEST}
diff --git a/etc/preremove/base-files.sh b/etc/preremove/base-files.sh
index 1868e37..b748836 100755
--- a/etc/preremove/base-files.sh
+++ b/etc/preremove/base-files.sh
@@ -6,7 +6,7 @@
# with this software.
# If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
-# base-files version 4.3-1
+# base-files version 4.3-3
MANIFEST="/etc/preremove/base-files-manifest.lst"
diff --git a/usr/share/doc/base-files/ChangeLog b/usr/share/doc/base-files/ChangeLog
index 8b75ff9..061be9c 100644
--- a/usr/share/doc/base-files/ChangeLog
+++ b/usr/share/doc/base-files/ChangeLog
@@ -2,16 +2,30 @@ Cygwin base system miscellaneous files
--------------------------------------
TODO:
-----
- * Should future versions relay in /etc/mkshrc to set PS1 properly for mksh
+ * Should future versions rely on /etc/mkshrc to set PS1 properly for mksh
if mksh supports sourcing /etc/mkshrc for interactive-login sessions?
* Ask zsh mantainer to put /etc/zprofile and /etc/zshrc in place during
installation.
- * Should users with GID 544 have /usr/bin/sbin in their paths?
+ * Should users with GID 544 have /usr/sbin in their paths?
* Enhance admins' prompt (ideas include the known # sign and using another
color, red?).
Change Log
----------
+4.3-3 (bugfix release)
+ * etc/defaults/etc/profile: Fix a bug so that the system variable
+ CYGWIN_USEWINPATH actually does what it was supposed to do.
+4.3-2 (bugfix/feature release)
+ * etc/defaults/etc/skel/.bashrc: Remove outdated comments on
+ completion and mention the bash_completion package as a
+ prerequisite. See cygwin.com/ml/cygwin/2016-03/msg00207.html
+ * etc/postinstall/base-files-profile.sh: If a non-default file is
+ kept, show a diff to the default version if /bin/diff is
+ installed and the target is a plain file.
+ * etc/postinstall/base-files-profile.sh: Do not touch file before
+ installing so the modes are kept intact, like cygport is already
+ doing for some time. Reported by Christian Franke, see
+ cygwin.com/ml/cygwin/2016-09/msg00059.html
4.3-1 (feature release)
* Cygwin.bat: Add to base-files. This version is independent of
the actual install path, see:
More information about the Cygwin-apps-cvs
mailing list