From 4e58ce79715707f00fce7d9b4a146f67720a7a3c Mon Sep 17 00:00:00 2001 From: Pavel Atanasov Date: Fri, 25 Nov 2022 20:01:43 +0200 Subject: [PATCH] fix(terminal.nix): quote font paths --- modules/terminal.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/terminal.nix b/modules/terminal.nix index 08e8636..3c65304 100644 --- a/modules/terminal.nix +++ b/modules/terminal.nix @@ -44,24 +44,24 @@ in if (cfg.font != null) then { linkFont = '' - $DRY_RUN_CMD mkdir $VERBOSE_ARG -p ${configDir} - if [ -e ${fontTarget} ] && ! [ -L ${fontTarget} ]; then - $DRY_RUN_CMD mv $VERBOSE_ARG ${fontTarget} ${fontBackup} + $DRY_RUN_CMD mkdir $VERBOSE_ARG -p "${configDir}" + if [ -e "${fontTarget}" ] && ! [ -L "${fontTarget}" ]; then + $DRY_RUN_CMD mv $VERBOSE_ARG "${fontTarget}" "${fontBackup}" $DRY_RUN_CMD echo "${fontTarget} has been moved to ${fontBackup}" fi - $DRY_RUN_CMD ln $VERBOSE_ARG -sf ${fontPath} ${fontTarget} + $DRY_RUN_CMD ln $VERBOSE_ARG -sf "${fontPath}" "${fontTarget}" ''; } else { unlinkFont = '' - if [ -e ${fontTarget} ] && [ -L ${fontTarget} ]; then - $DRY_RUN_CMD rm $VERBOSE_ARG ${fontTarget} - if [ -e ${fontBackup} ]; then - $DRY_RUN_CMD mv $VERBOSE_ARG ${fontBackup} ${fontTarget} + if [ -e "${fontTarget}" ] && [ -L "${fontTarget}" ]; then + $DRY_RUN_CMD rm $VERBOSE_ARG "${fontTarget}" + if [ -e "${fontBackup}" ]; then + $DRY_RUN_CMD mv $VERBOSE_ARG "${fontBackup}" "${fontTarget}" $DRY_RUN_CMD echo "${fontTarget} has been restored from backup" 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 $DRY_RUN_CMD echo "removed empty ${configDir}" fi