Restored msys2 to original files

This commit is contained in:
gator96100 2020-01-31 22:56:11 +01:00
commit df73aa0231
23 changed files with 173 additions and 52 deletions

View file

@ -5,13 +5,6 @@ check_install () {
fi
}
check_install_web () {
pacman -Q $1 | grep $2 > /dev/null
if [ $? == 1 ]; then
pacman --noconfirm --overwrite='*' -U $3
fi
}
clean_86 () {
rm -rf /mingw32/share/qt5/examples
pacman --noconfirm --overwrite='*' -Scc

12
msys2/ps/nsswitch.conf Normal file
View file

@ -0,0 +1,12 @@
# Begin /etc/nsswitch.conf
passwd: files
group: files
db_enum: files
db_home: cygwin desc
db_shell: cygwin desc
db_gecos: cygwin desc
# End /etc/nsswitch.conf

85
msys2/ps/pacman.conf Normal file
View file

@ -0,0 +1,85 @@
#
# /etc/pacman.conf
#
# See the pacman.conf(5) manpage for option and repository directives
#
# GENERAL OPTIONS
#
[options]
# The following paths are commented out with their default values listed.
# If you wish to use different paths, uncomment and update the paths.
#RootDir = /
#DBPath = /var/lib/pacman/
#CacheDir = /var/cache/pacman/pkg/
#LogFile = /var/log/pacman.log
#GPGDir = /etc/pacman.d/gnupg/
HoldPkg = pacman
#XferCommand = /usr/bin/curl -C - -f %u > %o
XferCommand = /usr/bin/wget --passive-ftp --timeout=10 -c -O %o %u
#CleanMethod = KeepInstalled
#UseDelta = 0.7
Architecture = auto
# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
#IgnorePkg =
#IgnoreGroup =
#NoUpgrade =
#NoExtract =
# Misc options
#UseSyslog
Color
#TotalDownload
CheckSpace
#VerbosePkgLists
# By default, pacman accepts packages signed by keys that its local keyring
# trusts (see pacman-key and its man page), as well as unsigned packages.
#SigLevel = Never
SigLevel = Required DatabaseOptional
LocalFileSigLevel = Optional
#RemoteFileSigLevel = Required
# NOTE: You must run `pacman-key --init` before first using pacman; the local
# keyring can then be populated with the keys of all official Arch Linux
# packagers with `pacman-key --populate archlinux`.
#
# REPOSITORIES
# - can be defined here or included from another file
# - pacman will search repositories in the order defined here
# - local/custom mirrors can be added here or in separate files
# - repositories listed first will take precedence when packages
# have identical names, regardless of version number
# - URLs will have $repo replaced by the name of the current repo
# - URLs will have $arch replaced by the name of the architecture
#
# Repository entries are of the format:
# [repo-name]
# Server = ServerName
# Include = IncludePath
#
# The header [repo-name] is crucial - it must be present and
# uncommented to enable the repo.
#
# The testing repositories are disabled by default. To enable, uncomment the
# repo name header and Include lines. You can add preferred servers immediately
# after the header, and they will be used before the default mirrors.
[mingw32]
Include = /etc/pacman.d/mirrorlist.mingw32
[mingw64]
Include = /etc/pacman.d/mirrorlist.mingw64
[msys]
Include = /etc/pacman.d/mirrorlist.msys
# An example of a custom package repository. See the pacman manpage for
# tips on creating your own repositories.
#[custom]
#SigLevel = Optional TrustAll
#Server = file:///home/custompkgs

18
msys2/ps/setup.cmd Normal file
View file

@ -0,0 +1,18 @@
@echo off
SET PATH=%cd%\msys2\usr\bin;%PATH%
copy /Y %cd%\msys2\ps\*.post %cd%\msys2\etc\post-install\ >NUL
copy /Y %cd%\msys2\ps\*.conf %cd%\msys2\etc\ >NUL
echo # For a description of the file format, see the Users Guide >%cd%\msys2/etc/fstab
echo # http://cygwin.com/cygwin-ug-net/using.html#mount-table >>%cd%\msys2/etc/fstab
echo none / cygdrive binary,posix=0,noacl,user 0 0 >>%cd%\msys2/etc/fstab
echo %~dp0pm3 /pm3 ntfs noacl 0 0 >>%cd%\msys2/etc/fstab
echo %~dp0gcc-arm-none-eabi /gcc-arm-none-eabi ntfs noacl 0 0 >>%cd%\msys2/etc/fstab
dash /usr/bin/rebaseall -p 2> nul
mkdir %cd%\msys2\tmp 2> nul
del %cd%\msys2\etc\passwd 2> nul
del %cd%\msys2\etc\group 2> nul
touch /etc/passwd
touch /etc/group
bash /ps/user_setup.sh

View file

@ -18,7 +18,4 @@ GROUP_MISSING=$( grep -Fq "$GROUP_SID" /etc/group )$?
# If not, add it
if [ $GROUP_MISSING != 0 ]; then
echo $MKGROUP_CURRENT >> /etc/group
fi
fi