wbrawner/distribution
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1314 from fewtarius/dev

Browse source 
Fix FileMan and unwanted output during first boot.
This commit is contained in:
fewtarius 2023-04-22 18:43:41 -04:00 committed by GitHub
commit 97895c3439
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/apps/fileman/package.mk
View file

@ -3,7 +3,7 @@
# Copyright (C) 2022-present Fewtarius
PKG_NAME="fileman"
PKG_VERSION="8a0b1464f1c30359d0b9856fb6eed1c405219cbf"
PKG_VERSION="af4d621"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="https://github.com/JustEnoughLinuxOS/fileman"

28
packages/sysutils/systemd/scripts/userconfig-setup
View file

@ -10,45 +10,45 @@ if [ ! -e "/storage/.configured" ]
then
tocon "Initializing configuration..."
# Copy config files, but don't overwrite. Only run if /storage is fresh
rsync -a --ignore-existing --exclude=es_systems.cfg /usr/config/* /storage/.config/ 2>&1 >/var/log/configure.log
rsync -a --ignore-existing --exclude=es_systems.cfg /usr/config/* /storage/.config/ >/var/log/configure.log 2>&1
if [ -e "/usr/bin/emulationstation" ]
then
tocon "Installing themes..."
mkdir -p /storage/.config/emulationstation/themes 2>&1 >>/var/log/configure.log
ln -s /usr/share/themes/es-theme-art-book-next /storage/.config/emulationstation/themes/system-theme 2>&1 >>/var/log/configure.log
ln -s /usr/share/themes/es-theme-minielec /storage/.config/emulationstation/themes/es-theme-minielec 2>&1 >>/var/log/configure.log
ln -s /usr/share/themes/es-theme-minimal /storage/.config/emulationstation/themes/es-theme-minimal 2>&1 >>/var/log/configure.log
mkdir -p /storage/.config/emulationstation/themes >>/var/log/configure.log
ln -s /usr/share/themes/es-theme-art-book-next /storage/.config/emulationstation/themes/system-theme >>/var/log/configure.log 2>&1
ln -s /usr/share/themes/es-theme-minielec /storage/.config/emulationstation/themes/es-theme-minielec >>/var/log/configure.log 2>&1
ln -s /usr/share/themes/es-theme-minimal /storage/.config/emulationstation/themes/es-theme-minimal >>/var/log/configure.log 2>&1
### Link the game controller database so it is managed with OS updates.
tocon "Configuring controller database..."
rm -f /storage/.config/SDL-GameControllerDB/gamecontrollerdb.txt 2>&1 >>/var/log/configure.log
ln -s /usr/config/SDL-GameControllerDB/gamecontrollerdb.txt /storage/.config/SDL-GameControllerDB/gamecontrollerdb.txt 2>&1 >>/var/log/configure.log
rm -f /storage/.config/SDL-GameControllerDB/gamecontrollerdb.txt >>/var/log/configure.log 2>&1
ln -s /usr/config/SDL-GameControllerDB/gamecontrollerdb.txt /storage/.config/SDL-GameControllerDB/gamecontrollerdb.txt >>/var/log/configure.log 2>&1
### Remove and link es configs so they are managed with OS updates.
for es_cfg in es_features.cfg es_systems.cfg
do
ln -s /usr/config/emulationstation/${es_cfg} /storage/.config/emulationstation/${es_cfg} 2>&1 >>/var/log/configure.log
ln -s /usr/config/emulationstation/${es_cfg} /storage/.config/emulationstation/${es_cfg} >>/var/log/configure.log 2>&1
done
### Link the ES splash to the distribution splash
rm -f /storage/.config/emulationstation/resources/logo.png 2>&1 >>/var/log/configure.log
ln -sf /usr/config/splash/splash.png /storage/.config/emulationstation/resources/logo.png 2>&1 >>/var/log/configure.log
rm -f /storage/.config/emulationstation/resources/logo.png >>/var/log/configure.log 2>&1
ln -sf /usr/config/splash/splash.png /storage/.config/emulationstation/resources/logo.png >>/var/log/configure.log 2>&1
fi
mkdir -p /storage/.config/modprobe.d 2>&1 >>/var/log/configure.log
touch /storage/.configured 2>&1 >>/var/log/configure.log
mkdir -p /storage/.config/modprobe.d >>/var/log/configure.log 2>&1
touch /storage/.configured >>/var/log/configure.log 2>&1
fi
if [ ! -e "/storage/.cache/ld.so.cache" ]
then
tocon "Initializing library cache..."
### Create library cache
ldconfig -X 2>&1 >>/var/log/configure.log
ldconfig -X >>/var/log/configure.log 2>&1
fi
if [ ! -d "/storage/.config/emulationstation/locale" ] && \
[ -e "/usr/bin/emulationstation" ]
then
tocon "Initializing language support..."
rsync -a --delete /usr/config/locale/ /storage/.config/emulationstation/locale/ 2>&1 >>/var/log/configure.log
rsync -a --delete /usr/config/locale/ /storage/.config/emulationstation/locale/ >>/var/log/configure.log 2>&1
fi