Manually fix up .pacnew files

Signed-off-by: Johannes Schindelin <[email protected]>

etc/bash.bashrc

@@ -44,9 +44,14 @@ unset _warning
 # otherwise set a default prompt
 # of user@host, MSYSTEM variable, and current_directory
 [[ -n "${MSYS2_PS1}" ]] && export PS1="${MSYS2_PS1}"
+# if we have the "High Mandatory Level" group, it means we're elevated
+if [[ -n "$(command -v getent)" ]] && id -G | grep -q "$(getent -w group 'S-1-16-12288' | cut -d: -f2)"
+  then _ps1_symbol='\[\e[1m\]#\[\e[0m\]'
+  else _ps1_symbol='\$'
+fi
 [[ $(declare -p PS1 2>/dev/null | cut -c 1-11) = 'declare -x ' ]] || \
-  export PS1='\[\e]0;\w\a\]\n\[\e[32m\]\u@\h \[\e[35m\]$MSYSTEM\[\e[0m\] \[\e[33m\]\w\[\e[0m\]\n\$ '
-
+  export PS1='\[\e]0;\w\a\]\n\[\e[32m\]\u@\h \[\e[35m\]$MSYSTEM\[\e[0m\] \[\e[33m\]\w\[\e[0m\]\n'"${_ps1_symbol}"' '
+unset _ps1_symbol
 
 # Uncomment to use the terminal colours set in DIR_COLORS
 # eval "$(dircolors -b /etc/DIR_COLORS)"

etc/profile

@@ -141,6 +141,7 @@ elif [ ! "x${KSH_VERSION}" = "x" ]; then
   PS1=$(print '\033]0;${PWD}\n\033[32m${USER}@${HOSTNAME} \033[33m${PWD/${HOME}/~}\033[0m\n$ ')
 elif [ ! "x${ZSH_VERSION}" = "x" ]; then
   HOSTNAME="$(/usr/bin/hostname)"
+  profile_d sh
   profile_d zsh
   PS1='(%n@%m)[%h] %~ %% '
 elif [ ! "x${POSH_VERSION}" = "x" ]; then

var/lib/pacman/local/git-extra-1.1.130.3672f11-1/desc

@@ -17,7 +17,7 @@ x86_64
 1487243003
 
 %INSTALLDATE%
-1487244959
+1487255391
 
 %PACKAGER%
 Unknown Packager