nix-community/nix-on-droid
1
0
Fork 0
mirror of https://github.com/nix-community/nix-on-droid.git synced 2025-11-08 19:46:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(terminal.nix): quote font paths

Browse source
This commit is contained in:
Pavel Atanasov 2022-11-25 20:01:43 +02:00 • committed by Tobias Happ
parent c16cb917d7
commit 4e58ce7971
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
modules/terminal.nix
View file

@ -44,24 +44,24 @@ in
if (cfg.font != null) then if (cfg.font != null) then
{ {
linkFont = '' linkFont = ''
$DRY_RUN_CMD mkdir $VERBOSE_ARG -p ${configDir} $DRY_RUN_CMD mkdir $VERBOSE_ARG -p "${configDir}"
if [ -e ${fontTarget} ] && ! [ -L ${fontTarget} ]; then if [ -e "${fontTarget}" ] && ! [ -L "${fontTarget}" ]; then
$DRY_RUN_CMD mv $VERBOSE_ARG ${fontTarget} ${fontBackup} $DRY_RUN_CMD mv $VERBOSE_ARG "${fontTarget}" "${fontBackup}"
$DRY_RUN_CMD echo "${fontTarget} has been moved to ${fontBackup}" $DRY_RUN_CMD echo "${fontTarget} has been moved to ${fontBackup}"
fi fi
$DRY_RUN_CMD ln $VERBOSE_ARG -sf ${fontPath} ${fontTarget} $DRY_RUN_CMD ln $VERBOSE_ARG -sf "${fontPath}" "${fontTarget}"
''; '';
} }
else else
{ {
unlinkFont = '' unlinkFont = ''
if [ -e ${fontTarget} ] && [ -L ${fontTarget} ]; then if [ -e "${fontTarget}" ] && [ -L "${fontTarget}" ]; then
$DRY_RUN_CMD rm $VERBOSE_ARG ${fontTarget} $DRY_RUN_CMD rm $VERBOSE_ARG "${fontTarget}"
if [ -e ${fontBackup} ]; then if [ -e "${fontBackup}" ]; then
$DRY_RUN_CMD mv $VERBOSE_ARG ${fontBackup} ${fontTarget} $DRY_RUN_CMD mv $VERBOSE_ARG "${fontBackup}" "${fontTarget}"
$DRY_RUN_CMD echo "${fontTarget} has been restored from backup" $DRY_RUN_CMD echo "${fontTarget} has been restored from backup"
else else
if $DRY_RUN_CMD rm $VERBOSE_ARG -d ${configDir} 2>/dev/null if $DRY_RUN_CMD rm $VERBOSE_ARG -d "${configDir}" 2>/dev/null
then then
$DRY_RUN_CMD echo "removed empty ${configDir}" $DRY_RUN_CMD echo "removed empty ${configDir}"
fi fi