psi-jack/zimfw
1
0
Fork 0
mirror of synced 2024-11-26 17:25:35 -05:00
Code Issues Releases Wiki Activity

Use cat to concatenate files in installation

Browse source 
Update installation instructions in README.md to use cat. Also add blank
lines at the end (instead of beginning) of template files, since they're
prepended (not appended) to existing files.

See difference of output between print and cat (zlogin having a blank
like at the end):

    % print -rn "$(<zlogin)$(<test)"
    #
    # User configuration sourced by login shells
    #

    # Initialize zim
    [[ -s ${ZIM_HOME}/login_init.zsh ]] && source ${ZIM_HOME}/login_init.zsh# Hello world
    % cat zlogin test
    #
    # User configuration sourced by login shells
    #

    # Initialize zim
    [[ -s ${ZIM_HOME}/login_init.zsh ]] && source ${ZIM_HOME}/login_init.zsh

    # Hello world

Fixes #94. Fixes #280. Closes #300
This commit is contained in:
Eric Nielsen 2018-11-21 11:58:30 -05:00 committed by GitHub
parent 7dfd617497
commit a05890e8b4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -47,11 +47,9 @@ Installing Zim is easy. If you have a different shell framework installed (like
2. Paste this into your terminal to prepend the initialization templates to your configs: 2. Paste this into your terminal to prepend the initialization templates to your configs:
``` ```
setopt EXTENDED_GLOB
for template_file in ${ZDOTDIR:-${HOME}}/.zim/templates/*; do for template_file in ${ZDOTDIR:-${HOME}}/.zim/templates/*; do
user_file="${ZDOTDIR:-${HOME}}/.${template_file:t}" user_file="${ZDOTDIR:-${HOME}}/.${template_file:t}"
touch ${user_file} cat ${template_file} ${user_file}(.N) >! ${user_file}
( print -rn "$(<${template_file})$(<${user_file})" >! ${user_file} ) 2>/dev/null
done done
``` ```

6
templates/zimrc
View file

@ -1,5 +1,3 @@
################# #################
# CORE SETTINGS # # CORE SETTINGS #
################# #################
@ -78,7 +76,6 @@ zinput_mode='emacs'
# removing the 'cursor' highlighter will fix the disappearing cursor problem # removing the 'cursor' highlighter will fix the disappearing cursor problem
zhighlighters=(main brackets cursor) zhighlighters=(main brackets cursor)
# #
# SSH # SSH
# #
@ -86,7 +83,6 @@ zhighlighters=(main brackets cursor)
# Load these ssh identities with the ssh module # Load these ssh identities with the ssh module
#zssh_ids=(id_rsa) #zssh_ids=(id_rsa)
# #
# Pacman # Pacman
# #
@ -96,3 +92,5 @@ zhighlighters=(main brackets cursor)
# Load any helper scripts as defined here # Load any helper scripts as defined here
#zpacman_helper=(aur) #zpacman_helper=(aur)

3
templates/zlogin
View file

@ -1,8 +1,7 @@
# #
# User configuration sourced by login shells # User configuration sourced by login shells
# #
# Initialize zim # Initialize zim
[[ -s ${ZIM_HOME}/login_init.zsh ]] && source ${ZIM_HOME}/login_init.zsh [[ -s ${ZIM_HOME}/login_init.zsh ]] && source ${ZIM_HOME}/login_init.zsh

5
templates/zshrc
View file

@ -1,11 +1,10 @@
# #
# User configuration sourced by interactive shells # User configuration sourced by interactive shells
# #
# Change default zim location # Define zim location
export ZIM_HOME=${ZDOTDIR:-${HOME}}/.zim export ZIM_HOME=${ZDOTDIR:-${HOME}}/.zim
# Start zim # Start zim
[[ -s ${ZIM_HOME}/init.zsh ]] && source ${ZIM_HOME}/init.zsh [[ -s ${ZIM_HOME}/init.zsh ]] && source ${ZIM_HOME}/init.zsh