public inbox for cygwin-apps-cvs@sourceware.org
help / color / mirror / Atom feed
* [base-files - A set of important system configuration and setup files] branch master, updated. 6ac3819b2fcbb23c7229fc0dddb32355315f878f
@ 2016-09-03 12:05 gratz
  0 siblings, 0 replies; only message in thread
From: gratz @ 2016-09-03 12:05 UTC (permalink / raw)
  To: cygwin-apps-cvs




https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/base-files.git;h=6ac3819b2fcbb23c7229fc0dddb32355315f878f

commit 6ac3819b2fcbb23c7229fc0dddb32355315f878f
Author: Achim Gratz <Stromeko@Stromeko.DE>
Date:   Sat Sep 3 13:37:59 2016 +0200

    Bump version to 4.3-1

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/base-files.git;h=7c8a5ebda6a8aa79b42b6c18eec422ca2a401293

commit 7c8a5ebda6a8aa79b42b6c18eec422ca2a401293
Author: Achim Gratz <Stromeko@Stromeko.DE>
Date:   Sat Sep 3 12:53:09 2016 +0200

    add Cygwin.bat which automatically determines the installation path

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/base-files.git;h=daed420eaad2b8f264fd9fb1ab22b69413b442bc

commit daed420eaad2b8f264fd9fb1ab22b69413b442bc
Author: Achim Gratz <Stromeko@Stromeko.DE>
Date:   Sat Sep 3 11:04:52 2016 +0200

    Allow the use of the unaltered existing system PATH

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/base-files.git;h=1a0eeeba0449925c06a8dfb57f73830c125ea515

commit 1a0eeeba0449925c06a8dfb57f73830c125ea515
Author: Achim Gratz <Stromeko@Stromeko.DE>
Date:   Sun Jan 31 10:48:05 2016 +0100

    avoid second invocation of /usr/bin/hostname

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/base-files.git;h=3683c2fbf35cadc798dd6eb4227a63366cf9ad8d

commit 3683c2fbf35cadc798dd6eb4227a63366cf9ad8d
Author: Achim Gratz <Stromeko@Stromeko.DE>
Date:   Sun Jan 31 10:36:46 2016 +0100

    Do not depend on /cygdrive prefix settings
    
        * etc/postinstall/base-files-mketc.sh (WINETC): Use /proc/cygdrive
          prefixed path which keeps working even if the user changes the
          /cygdrive prefix after installation.


Diff:
---
 Cygwin.bat                            |    4 ++++
 etc/defaults/etc/bash.bash_logout     |    2 +-
 etc/defaults/etc/bash.bashrc          |    2 +-
 etc/defaults/etc/profile              |   21 +++++++++++++++------
 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         |    2 +-
 etc/defaults/etc/skel/.inputrc        |    2 +-
 etc/defaults/etc/skel/.profile        |    2 +-
 etc/postinstall/base-files-mketc.sh   |    4 ++--
 etc/postinstall/base-files-profile.sh |    2 +-
 etc/preremove/base-files-manifest.lst |    1 +
 etc/preremove/base-files.sh           |    2 +-
 usr/share/doc/base-files/ChangeLog    |   13 +++++++++++++
 17 files changed, 47 insertions(+), 20 deletions(-)

diff --git a/Cygwin.bat b/Cygwin.bat
new file mode 100644
index 0000000..cfa7d98
--- /dev/null
+++ b/Cygwin.bat
@@ -0,0 +1,4 @@
+@echo off
+setlocal enableextensions
+set TERM=
+cd /d "%~dp0bin" && .\bash --login -i
diff --git a/etc/defaults/etc/bash.bash_logout b/etc/defaults/etc/bash.bash_logout
index 301f5b8..35f97cc 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.2-4
+# base-files version 4.3-1
 
 # /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 04ac2e4..0f633fa 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.2-4
+# base-files version 4.3-1
 
 # /etc/bash.bashrc: executed by bash(1) for interactive shells.
 
diff --git a/etc/defaults/etc/profile b/etc/defaults/etc/profile
index 5468b04..c9ea9c9 100755
--- a/etc/defaults/etc/profile
+++ b/etc/defaults/etc/profile
@@ -5,7 +5,7 @@
 # with this software.
 # If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
 
-# base-files version 4.2-4
+# base-files version 4.3-1
 
 # /etc/profile: executed by the command interpreter for login shells.
 
@@ -33,10 +33,19 @@ if [ -z "${PROFILEREAD+true}" ] ; then
   # To learn more about startup files, refer to your shell's man page.
 
   : ${ORIGINAL_PATH=${PATH}}
-  if [ ${CYGWIN_NOWINPATH-addwinpath} = "addwinpath" ] ; then
-    PATH="/usr/local/bin:/usr/bin${PATH:+:${PATH}}"
-  else
-    PATH="/usr/local/bin:/usr/bin"
+  # 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
+    # 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
+    # you need in your personal startup files
+    if [ ${CYGWIN_NOWINPATH-addwinpath} = "addwinpath" ] ; then
+	PATH="/usr/local/bin:/usr/bin${PATH:+:${PATH}}"
+    else
+	PATH="/usr/local/bin:/usr/bin"
+    fi
   fi
 
 # see https://cygwin.com/ml/cygwin/2014-05/msg00352.html
@@ -138,7 +147,7 @@ profile_d sh
 if [ ! "x${BASH_VERSION}" = "x"  ]; then
   [ -f "/etc/bash.bashrc" ] && . "/etc/bash.bashrc"
 elif [ ! "x${KSH_VERSION}" = "x" ]; then
-  typeset -l HOSTNAME="$(/usr/bin/hostname)"
+  typeset -l HOSTNAME
   [ "${PS1-null}" = "null" ] || PS1=$(print '\033]0;${PWD}\n\033[32m${USER}@${HOSTNAME} \033[33m${PWD/${HOME}/~}\033[0m\n$ ')
 elif [ ! "x${ZSH_VERSION}" = "x" ]; then
   # zsh is in shell compatibility mode here, so we probably shouldn't do this
diff --git a/etc/defaults/etc/profile.d/lang.csh b/etc/defaults/etc/profile.d/lang.csh
index d9e9e74..ada590b 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.2-4
+# base-files version 4.3-1
 
 # /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 07f553f..1cbe96b 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.2-4
+# base-files version 4.3-1
 
 # /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 b9152b3..520d58b 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.2-4
+# base-files version 4.3-1
 
 # /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 c9749a6..18516ba 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.2-4
+# base-files version 4.3-1
 
 # /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 c580618..1e23df0 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.2-4
+# base-files version 4.3-1
 
 # ~/.bash_profile: executed by bash(1) for login shells.
 
diff --git a/etc/defaults/etc/skel/.bashrc b/etc/defaults/etc/skel/.bashrc
index 2fcad95..8b9605b 100644
--- a/etc/defaults/etc/skel/.bashrc
+++ b/etc/defaults/etc/skel/.bashrc
@@ -5,7 +5,7 @@
 # with this software. 
 # If not, see <http://creativecommons.org/publicdomain/zero/1.0/>. 
 
-# base-files version 4.2-4
+# base-files version 4.3-1
 
 # ~/.bashrc: executed by bash(1) for interactive shells.
 
diff --git a/etc/defaults/etc/skel/.inputrc b/etc/defaults/etc/skel/.inputrc
index 3f5744e..9231c22 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.2-4
+# base-files version 4.3-1
 
 # ~/.inputrc: readline initialization file.
 
diff --git a/etc/defaults/etc/skel/.profile b/etc/defaults/etc/skel/.profile
index 6b44625..84fe5c1 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.2-4
+# base-files version 4.3-1
 
 # ~/.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 1790cfb..28127d3 100755
--- a/etc/postinstall/base-files-mketc.sh
+++ b/etc/postinstall/base-files-mketc.sh
@@ -6,14 +6,14 @@
 # with this software. 
 # If not, see <http://creativecommons.org/publicdomain/zero/1.0/>. 
 
-# base-files version 4.2-4
+# base-files version 4.3-1
 
 # Create symbolic links from some /etc files to the Windows equivalents
 # Set perms to /tmp directory
 
 FILES="hosts protocols services networks"
 OSNAME="$(/usr/bin/uname -s)"
-WINETC="$(/usr/bin/cygpath -S -u)/drivers/etc"
+WINETC="$(/usr/bin/cygpath -S -U)/drivers/etc"
 
 if [ ! -d "${WINETC}" ]; then
   echo "Directory ${WINETC} does not exist; exiting" >&2
diff --git a/etc/postinstall/base-files-profile.sh b/etc/postinstall/base-files-profile.sh
index 304adc2..40cd2ac 100755
--- a/etc/postinstall/base-files-profile.sh
+++ b/etc/postinstall/base-files-profile.sh
@@ -6,7 +6,7 @@
 # with this software. 
 # If not, see <http://creativecommons.org/publicdomain/zero/1.0/>. 
 
-# base-files version 4.2-4
+# base-files version 4.3-1
 
 MANIFEST="/etc/preremove/base-files-manifest.lst"
 
diff --git a/etc/preremove/base-files-manifest.lst b/etc/preremove/base-files-manifest.lst
index 9deab5f..4e20807 100644
--- a/etc/preremove/base-files-manifest.lst
+++ b/etc/preremove/base-files-manifest.lst
@@ -1,3 +1,4 @@
+Cygwin.bat
 etc/profile.d/lang.sh
 etc/profile.d/lang.csh
 etc/profile.d/tzset.sh
diff --git a/etc/preremove/base-files.sh b/etc/preremove/base-files.sh
index 5ad249c..1868e37 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.2-4
+# base-files version 4.3-1
 
 MANIFEST="/etc/preremove/base-files-manifest.lst"
 
diff --git a/usr/share/doc/base-files/ChangeLog b/usr/share/doc/base-files/ChangeLog
index 5100a44..8b75ff9 100644
--- a/usr/share/doc/base-files/ChangeLog
+++ b/usr/share/doc/base-files/ChangeLog
@@ -12,6 +12,19 @@ TODO:
 
 Change Log
 ----------
+4.3-1 (feature release)
+    * Cygwin.bat: Add to base-files.  This version is independent of
+      the actual install path, see:
+      cygwin.com/ml/cygwin/2016-08/msg00617.html
+    * etc/defaults/etc/profile: Allow the use of the unaltered
+      existing system PATH by setting the system variable
+      CYGWIN_USEWINPATH.
+    * etc/defaults/etc/profile: avoid second invocation of
+      /usr/bin/hostname.  Reported by Helmut Karlowski, see
+      cygwin.com/ml/cygwin/2015-12/msg00080.html
+    * etc/postinstall/base-files-mketc.sh (WINETC): Use /proc/cygdrive
+      prefixed path which keeps working even if the user changes the
+      /cygdrive prefix after installation.
 4.2-4 (bugfix release)
     * etc/postinstall/base-files-mketc.sh: Windows only uses 8 characters
       for files in the WINETC directory.  Check if the symlink target


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2016-09-03 12:05 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-03 12:05 [base-files - A set of important system configuration and setup files] branch master, updated. 6ac3819b2fcbb23c7229fc0dddb32355315f878f gratz

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).