Hello community, here is the log from the commit of package homeshick for openSUSE:Leap:15.2 checked in at 2020-05-21 12:59:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/homeshick (Old) and /work/SRC/openSUSE:Leap:15.2/.homeshick.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "homeshick" Thu May 21 12:59:44 2020 rev:13 rq:807669 version:2.0.0 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/homeshick/homeshick.changes 2020-01-15 15:10:57.262090972 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.homeshick.new.2738/homeshick.changes 2020-05-21 13:00:03.102888124 +0200 @@ -1,0 +2,8 @@ +Sat May 16 11:59:00 UTC 2020 - Olav Reinert <seroto...@gmail.com> + +- Upgrade to version 2.0.0: + * Breaking: Moved ./bin/homeshick.csh to ./homeshick.csh + * Speed up refresh operation by reducing exec calls + * Fix some path quoting issues + +------------------------------------------------------------------- Old: ---- v1.1.0.tar.gz New: ---- v2.0.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ homeshick.spec ++++++ --- /var/tmp/diff_new_pack.pZUB5J/_old 2020-05-21 13:00:03.610889230 +0200 +++ /var/tmp/diff_new_pack.pZUB5J/_new 2020-05-21 13:00:03.618889248 +0200 @@ -1,7 +1,7 @@ # # spec file for package homeshick # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,17 +12,17 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: homeshick -Version: 1.1.0 +Version: 2.0.0 Release: 0 Summary: Dotfile synchronizer based on Git and Bash License: MIT Group: Productivity/File utilities -Url: https://github.com/andsens/homeshick +URL: https://github.com/andsens/homeshick Source0: https://github.com/andsens/homeshick/archive/v%{version}.tar.gz Source1: README-openSUSE.md Source99: homeshick.rpmlintrc @@ -33,10 +33,10 @@ BuildRequires: tcsh Requires: bash >= 3 Requires: git >= 1.5 -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %if 0%{?is_opensuse} BuildRequires: bats +BuildRequires: dash BuildRequires: fish %endif @@ -50,14 +50,14 @@ frameworks, such as oh-my-zsh, found on sites like https://dotfiles.github.io/. %prep -%setup -q -n %{name}-%{version} +%setup -q %patch0 -p1 %build %install mkdir -p %{buildroot}%{_datadir}/%{name} -mv %{name}.sh %{name}.fish bin lib completions %{buildroot}%{_datadir}/%{name} +mv %{name}.sh %{name}.fish %{name}.csh bin lib completions %{buildroot}%{_datadir}/%{name} mkdir -p %{buildroot}%{_bindir} ln -s %{_datadir}/%{name}/bin/homeshick %{buildroot}%{_bindir}/%{name} cp %{SOURCE1} . @@ -69,7 +69,6 @@ fi %files -%defattr(-,root,root) %doc README.md README-openSUSE.md CONTRIBUTING.md %license LICENSE %{_datadir}/%{name} ++++++ suse-packaging.patch ++++++ --- /var/tmp/diff_new_pack.pZUB5J/_old 2020-05-21 13:00:03.690889404 +0200 +++ /var/tmp/diff_new_pack.pZUB5J/_new 2020-05-21 13:00:03.694889414 +0200 @@ -12,14 +12,14 @@ # On travis-ci exit_status for some reason errors out, ignore it # shellcheck disable=SC1090 source "$homeshick/lib/exit_status.sh" -diff -r -u homeshick-1.1.0-orig/bin/homeshick.csh homeshick-1.1.0/bin/homeshick.csh ---- homeshick-1.1.0-orig/bin/homeshick.csh 2018-04-12 21:52:30.000000000 +0200 -+++ homeshick-1.1.0/bin/homeshick.csh 2018-06-07 21:35:03.398240964 +0200 +diff -r -u homeshick-1.1.0-orig/homeshick.csh homeshick-1.1.0/homeshick.csh +--- homeshick-1.1.0-orig/homeshick.csh 2018-04-12 21:52:30.000000000 +0200 ++++ homeshick-1.1.0/homeshick.csh 2018-06-07 21:35:03.398240964 +0200 @@ -1,6 +1,6 @@ # This helper script should be sourced via an alias, e.g. # --# alias homeshick "source $HOME/.homesick/repos/homeshick/bin/homeshick.csh" -+# alias homeshick "source /usr/share/homeshick/bin/homeshick.csh" +-# alias homeshick "source $HOME/.homesick/repos/homeshick/homeshick.csh" ++# alias homeshick "source /usr/share/homeshick/homeshick.csh" # if ( "$1" == "cd" && "x$2" != "x" ) then if ( -d "$HOME/.homesick/repos/$2/home" ) then @@ -55,7 +55,7 @@ @@ -1,6 +1,5 @@ -#!/usr/bin/env sh # This script should be sourced in the context of your shell like so: --# source $HOME/.homeshick/repos/.homeshick/homeshick.sh +-# source $HOME/.homesick/repos/.homeshick/homeshick.sh +# source /usr/share/homeshick/homeshick.sh # Once the homeshick() function is defined, you can type # "homeshick cd CASTLE" to enter a castle. ++++++ v1.1.0.tar.gz -> v2.0.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/homeshick-1.1.0/.travis.yml new/homeshick-2.0.0/.travis.yml --- old/homeshick-1.1.0/.travis.yml 2018-04-12 21:52:30.000000000 +0200 +++ new/homeshick-2.0.0/.travis.yml 2020-03-05 22:22:53.000000000 +0100 @@ -1,6 +1,6 @@ language: bash -dist: trusty +dist: bionic addons: apt: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/homeshick-1.1.0/README.md new/homeshick-2.0.0/README.md --- old/homeshick-1.1.0/README.md 2018-04-12 21:52:30.000000000 +0200 +++ new/homeshick-2.0.0/README.md 2020-03-05 22:22:53.000000000 +0100 @@ -31,7 +31,7 @@ # from sh and its derivates (bash, dash, ksh, zsh etc.) printf '\nsource "$HOME/.homesick/repos/homeshick/homeshick.sh"' >> $HOME/.bashrc # csh and derivatives (i.e. tcsh) -printf '\nalias homeshick source "$HOME/.homesick/repos/homeshick/bin/homeshick.csh"\n' >> $HOME/.cshrc +printf '\nalias homeshick source "$HOME/.homesick/repos/homeshick/homeshick.csh"\n' >> $HOME/.cshrc # fish shell echo \n'source "$HOME/.homesick/repos/homeshick/homeshick.fish"' >> "$HOME/.config/fish/config.fish" ``` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/homeshick-1.1.0/bin/homeshick new/homeshick-2.0.0/bin/homeshick --- old/homeshick-1.1.0/bin/homeshick 2018-04-12 21:52:30.000000000 +0200 +++ new/homeshick-2.0.0/bin/homeshick 2020-03-05 22:22:53.000000000 +0100 @@ -23,14 +23,18 @@ type git &>/dev/null || err "$EX_SOFTWARE" "git not found in path" -mkdir -p "$repos" +if [[ ! -d $repos ]]; then + mkdir -p "$repos" +fi # used in pull.sh # shellcheck disable=SC2034 T_START=$(date +%s) -GIT_VERSION=$(git --version | grep 'git version' | cut -d ' ' -f 3) -if [[ ! $GIT_VERSION =~ ([0-9]+)(\.[0-9]+){0,3} ]]; then - err "$EX_SOFTWARE" "could not determine git version" +if [[ -z $GIT_VERSION ]]; then + read -r _ _ GIT_VERSION _ < <(command git --version) + if [[ ! $GIT_VERSION =~ ([0-9]+)(\.[0-9]+){0,3} ]]; then + err "$EX_SOFTWARE" "could not determine git version" + fi fi TALK=true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/homeshick-1.1.0/bin/homeshick.csh new/homeshick-2.0.0/bin/homeshick.csh --- old/homeshick-1.1.0/bin/homeshick.csh 2018-04-12 21:52:30.000000000 +0200 +++ new/homeshick-2.0.0/bin/homeshick.csh 1970-01-01 01:00:00.000000000 +0100 @@ -1,17 +0,0 @@ -# This helper script should be sourced via an alias, e.g. -# -# alias homeshick "source $HOME/.homesick/repos/homeshick/bin/homeshick.csh" -# -if ( "$1" == "cd" && "x$2" != "x" ) then - if ( -d "$HOME/.homesick/repos/$2/home" ) then - cd "$HOME/.homesick/repos/$2/home" - else - cd "$HOME/.homesick/repos/$2" - endif -else - if ( $?HOMESHICK_DIR ) then - $HOMESHICK_DIR/bin/homeshick $* - else - $HOME/.homesick/repos/homeshick/bin/homeshick $* - endif -endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/homeshick-1.1.0/homeshick.csh new/homeshick-2.0.0/homeshick.csh --- old/homeshick-1.1.0/homeshick.csh 1970-01-01 01:00:00.000000000 +0100 +++ new/homeshick-2.0.0/homeshick.csh 2020-03-05 22:22:53.000000000 +0100 @@ -0,0 +1,17 @@ +# This helper script should be sourced via an alias, e.g. +# +# alias homeshick "source $HOME/.homesick/repos/homeshick/homeshick.csh" +# +if ( "$1" == "cd" && "x$2" != "x" ) then + if ( -d "$HOME/.homesick/repos/$2/home" ) then + cd "$HOME/.homesick/repos/$2/home" + else + cd "$HOME/.homesick/repos/$2" + endif +else + if ( $?HOMESHICK_DIR ) then + $HOMESHICK_DIR/bin/homeshick $* + else + $HOME/.homesick/repos/homeshick/bin/homeshick $* + endif +endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/homeshick-1.1.0/homeshick.sh new/homeshick-2.0.0/homeshick.sh --- old/homeshick-1.1.0/homeshick.sh 2018-04-12 21:52:30.000000000 +0200 +++ new/homeshick-2.0.0/homeshick.sh 2020-03-05 22:22:53.000000000 +0100 @@ -1,6 +1,6 @@ #!/usr/bin/env sh # This script should be sourced in the context of your shell like so: -# source $HOME/.homeshick/repos/.homeshick/homeshick.sh +# source $HOME/.homesick/repos/.homeshick/homeshick.sh # Once the homeshick() function is defined, you can type # "homeshick cd CASTLE" to enter a castle. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/homeshick-1.1.0/lib/commands/refresh.sh new/homeshick-2.0.0/lib/commands/refresh.sh --- old/homeshick-1.1.0/lib/commands/refresh.sh 2018-04-12 21:52:30.000000000 +0200 +++ new/homeshick-2.0.0/lib/commands/refresh.sh 2020-03-05 22:22:53.000000000 +0100 @@ -12,10 +12,8 @@ if [[ -e $fetch_head ]]; then local last_mod - local time_now last_mod=$(stat -c %Y "$fetch_head" 2> /dev/null || stat -f %m "$fetch_head") - time_now=$(date +%s) - if [[ $((time_now-last_mod)) -gt $threshhold ]]; then + if [[ $((T_START-last_mod)) -gt $threshhold ]]; then fail "outdated" return "$EX_TH_EXCEEDED" else @@ -44,10 +42,8 @@ # we reset the outdated ones by touching FETCH_HEAD if [[ -e $fetch_head ]]; then local last_mod - local time_now last_mod=$(stat -c %Y "$fetch_head" 2> /dev/null || stat -f %m "$fetch_head") - time_now=$(date +%s) - if [[ $((time_now-last_mod)) -gt $threshhold ]]; then + if [[ $((T_START-last_mod)) -gt $threshhold ]]; then outdated_castles+=("$castle") ! $BATCH && touch "$fetch_head" fi @@ -71,8 +67,8 @@ IFS=$OIFS fi if prompt_no 'refresh' "$msg" 'pull?'; then - # shellcheck source=lib/commands/pull.sh - source $homeshick/lib/commands/pull.sh + # shellcheck source=lib/commands/pull.sh disable=SC2154 + source "$homeshick/lib/commands/pull.sh" for castle in "$@"; do pull "$castle" done diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/homeshick-1.1.0/lib/fs.sh new/homeshick-2.0.0/lib/fs.sh --- old/homeshick-1.1.0/lib/fs.sh 2018-04-12 21:52:30.000000000 +0200 +++ new/homeshick-2.0.0/lib/fs.sh 2020-03-05 22:22:53.000000000 +0100 @@ -22,8 +22,12 @@ function list_castle_names { while IFS= read -d $'\0' -r repo ; do + # Avoid using basename for a small speed-up + # See link, for why it's OK to use bash string substitution in this case + # https://github.com/andsens/homeshick/pull/181/files#r196206593 local reponame - reponame=$(basename "${repo%/.git}") + reponame="${repo%/.git}" + reponame="${reponame##*/}" printf "%s\n" "$reponame" done < <(find -L "$repos" -mindepth 2 -maxdepth 2 -name .git -type d -print0 | sort -z) return "$EX_SUCCESS" @@ -71,15 +75,15 @@ local parts=() local rest=$path while [[ $rest != '.' && $rest != '/' ]]; do - parts+=($(basename "$rest")) + parts+=("$(basename "$rest")") rest=$(dirname "$rest") done # reverse $parts, it's a lot easier to follow the code below then local new_parts=() for (( idx=${#parts[@]}-1 ; idx>=0 ; idx-- )); do - new_parts+=(${parts[$idx]}) + new_parts+=("${parts[$idx]}") done - parts=(${new_parts[@]}) + parts=("${new_parts[@]}") local left local right @@ -127,9 +131,9 @@ for j in "${!parts[@]}"; do [[ $omit_left = true && $j -eq $i ]] && continue [[ $omit_right = true && $j -eq $i+1 ]] && continue - new_parts+=(${parts[$j]}) + new_parts+=("${parts[$j]}") done - parts=(${new_parts[@]}) + parts=("${new_parts[@]}") if [[ $omit_left = false && $omit_right = false ]]; then break fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/homeshick-1.1.0/lib/git.sh new/homeshick-2.0.0/lib/git.sh --- old/homeshick-1.1.0/lib/git.sh 2018-04-12 21:52:30.000000000 +0200 +++ new/homeshick-2.0.0/lib/git.sh 2020-03-05 22:22:53.000000000 +0100 @@ -6,6 +6,7 @@ return 0 fi local IFS=. + # shellcheck disable=SC2206 local i ver1=($1) ver2=($2) # fill empty fields in ver1 with zeros for ((i=${#ver1[@]}; i<${#ver2[@]}; i++)); do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/homeshick-1.1.0/lib/log.sh new/homeshick-2.0.0/lib/log.sh --- old/homeshick-1.1.0/lib/log.sh 2018-04-12 21:52:30.000000000 +0200 +++ new/homeshick-2.0.0/lib/log.sh 2020-03-05 22:22:53.000000000 +0100 @@ -26,8 +26,8 @@ } function help_err { - # shellcheck source=lib/commands/help.sh - source $homeshick/lib/commands/help.sh + # shellcheck source=lib/commands/help.sh disable=SC2154 + source "$homeshick/lib/commands/help.sh" extended_help "$1" exit "$EX_USAGE" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/homeshick-1.1.0/lib/prompt.sh new/homeshick-2.0.0/lib/prompt.sh --- old/homeshick-1.1.0/lib/prompt.sh 2018-04-12 21:52:30.000000000 +0200 +++ new/homeshick-2.0.0/lib/prompt.sh 2020-03-05 22:22:53.000000000 +0100 @@ -11,8 +11,8 @@ IFS=$OIFS fi if prompt_no 'updates' "$msg" 'symlink?'; then - # shellcheck source=lib/commands/link.sh - source $homeshick/lib/commands/link.sh + # shellcheck source=lib/commands/link.sh disable=SC2154 + source "$homeshick/lib/commands/link.sh" for castle in "$@"; do symlink "$castle" done diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/homeshick-1.1.0/test/helper.bash new/homeshick-2.0.0/test/helper.bash --- old/homeshick-1.1.0/test/helper.bash 2018-04-12 21:52:30.000000000 +0200 +++ new/homeshick-2.0.0/test/helper.bash 2020-03-05 22:22:53.000000000 +0100 @@ -19,8 +19,8 @@ repo_dir=$(cd "$TESTDIR/.." && pwd) export HOMESHICK_DIR=${HOMESHICK_DIR:-$repo_dir} export HOMESHICK_FN_SRC_SH="$HOMESHICK_DIR/homeshick.sh" - export HOMESHICK_FN_SRC_CSH="$HOMESHICK_DIR/bin/homeshick.csh" export HOMESHICK_FN_SRC_FISH="$HOMESHICK_DIR/homeshick.fish" + export HOMESHICK_FN_SRC_CSH="$HOMESHICK_DIR/homeshick.csh" export HOMESHICK_BIN="$HOMESHICK_DIR/bin/homeshick" # Check if expect is installed @@ -57,6 +57,7 @@ local repo_dir repo_dir=$(cd "$TESTDIR/.." && pwd) ln -s "$repo_dir/homeshick.sh" "$hs_repo/homeshick.sh" + ln -s "$repo_dir/homeshick.csh" "$hs_repo/homeshick.csh" ln -s "$repo_dir/homeshick.fish" "$hs_repo/homeshick.fish" ln -s "$repo_dir/bin" "$hs_repo/bin" ln -s "$repo_dir/lib" "$hs_repo/lib" @@ -115,6 +116,7 @@ return 0 fi local IFS=. + # shellcheck disable=SC2206 local i ver1=($1) ver2=($2) # fill empty fields in ver1 with zeros for ((i=${#ver1[@]}; i<${#ver2[@]}; i++)); do @@ -136,41 +138,15 @@ } function get_git_version { - GIT_VERSION=$(git --version | grep 'git version' | cut -d ' ' -f 3) - [[ ! $GIT_VERSION =~ ([0-9]+)(\.[0-9]+){0,3} ]] && skip 'could not detect git version' + if [[ -z $GIT_VERSION ]]; then + read -r _ _ GIT_VERSION _ < <(command git --version) + if [[ ! $GIT_VERSION =~ ([0-9]+)(\.[0-9]+){0,3} ]]; then + skip 'could not detect git version' + fi + fi printf "%s" "$GIT_VERSION" } -function mock_git_version { - # To mock a git version we simply create a function wrapper for it - # and forward all calls to git except `git --version` - local real_git - real_git=$(which git) - # Don't mess with quoting in this eval, it works... - # shellcheck disable=SC2086 - eval " - function git { - if [[ \$1 == '--version' ]]; then - echo "git version $1" - return 0 - else - local res - # Some variable expansions used by git internally may break, - # if we just forward the arguments with '\$@', - # so we unset this function until the execution is completed. - unset git - $real_git "\$@" - res=\$? - mock_git_version $1 - return \$res - fi - } - " - # The functions need to be exported for them to work in child processes - export -f git - export -f mock_git_version -} - function commit_repo_state { local repo=$1 ( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/homeshick-1.1.0/test/interactive new/homeshick-2.0.0/test/interactive --- old/homeshick-1.1.0/test/interactive 2018-04-12 21:52:30.000000000 +0200 +++ new/homeshick-2.0.0/test/interactive 2020-03-05 22:22:53.000000000 +0100 @@ -35,6 +35,7 @@ set +T output="$("$@" 2>&1)" status="$?" + # shellcheck disable=SC2206 IFS=$'\n' lines=($output) [ -z "$e" ] || set -e [ -z "$E" ] || set -E diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/homeshick-1.1.0/test/setup-default.sh new/homeshick-2.0.0/test/setup-default.sh --- old/homeshick-1.1.0/test/setup-default.sh 2018-04-12 21:52:30.000000000 +0200 +++ new/homeshick-2.0.0/test/setup-default.sh 2020-03-05 22:22:53.000000000 +0100 @@ -11,6 +11,6 @@ autoload -U compinit compinit EOF -printf '\nalias homeshick source "$HOME/.homesick/repos/homeshick/bin/homeshick.csh"' >> "$HOME/.cshrc" +printf '\nalias homeshick source "$HOME/.homesick/repos/homeshick/homeshick.csh"' >> "$HOME/.cshrc" mkdir -p "$HOME/.config/fish" printf '\nsource "$HOME/.homesick/repos/homeshick/homeshick.fish"' >> "$HOME/.config/fish/config.fish" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/homeshick-1.1.0/test/suites/clean_path.bats new/homeshick-2.0.0/test/suites/clean_path.bats --- old/homeshick-1.1.0/test/suites/clean_path.bats 2018-04-12 21:52:30.000000000 +0200 +++ new/homeshick-2.0.0/test/suites/clean_path.bats 2020-03-05 22:22:53.000000000 +0100 @@ -106,3 +106,13 @@ clean_path '/home/user../../somedir' test_clean_path '/home/user../../somedir' '/home/somedir' } + +@test 'clean /home/user../../some dir' { + clean_path '/home/user../../some dir' + test_clean_path '/home/user../../some dir' '/home/some dir' +} + +@test 'clean /home/user name../../some dir' { + clean_path '/home/user name../../some dir' + test_clean_path '/home/user name../../some dir' '/home/some dir' +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/homeshick-1.1.0/test/suites/clone.bats new/homeshick-2.0.0/test/suites/clone.bats --- old/homeshick-1.1.0/test/suites/clone.bats 2018-04-12 21:52:30.000000000 +0200 +++ new/homeshick-2.0.0/test/suites/clone.bats 2020-03-05 22:22:53.000000000 +0100 @@ -68,11 +68,8 @@ @test 'recursive clone with git version < 1.6.5' { fixture 'nested-submodules' - mock_git_version 1.6.4 - $HOMESHICK_FN --batch clone "$REPO_FIXTURES/nested-submodules" + GIT_VERSION=1.6.4 $HOMESHICK_FN --batch clone "$REPO_FIXTURES/nested-submodules" [ -e "$HOMESICK/repos/nested-submodules/level1" ] [ ! -e "$HOMESICK/repos/nested-submodules/level1/level2/info" ] - # "unmock" git - unset git } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/homeshick-1.1.0/test/suites/homeshick_dir.bats new/homeshick-2.0.0/test/suites/homeshick_dir.bats --- old/homeshick-1.1.0/test/suites/homeshick_dir.bats 2018-04-12 21:52:30.000000000 +0200 +++ new/homeshick-2.0.0/test/suites/homeshick_dir.bats 2020-03-05 22:22:53.000000000 +0100 @@ -18,7 +18,7 @@ @test 'csh with homeshick_dir override' { [ "$(type -t csh)" = "file" ] || skip "csh not installed" - cmd="set HOMESHICK_DIR=/nowhere; source ${HOMESHICK_BIN}.csh" + cmd="set HOMESHICK_DIR=/nowhere; source \"${HOMESHICK_FN_SRC_CSH}\"" local result=$( csh <<< "$cmd" 2>&1 >/dev/null ) [[ "$result" =~ "/nowhere/" ]] } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/homeshick-1.1.0/test/suites/track.bats new/homeshick-2.0.0/test/suites/track.bats --- old/homeshick-1.1.0/test/suites/track.bats 2018-04-12 21:52:30.000000000 +0200 +++ new/homeshick-2.0.0/test/suites/track.bats 2020-03-05 22:22:53.000000000 +0100 @@ -267,15 +267,12 @@ [[ $status -lt 2 ]] && skip 'git version too high' castle 'rc-files' - mock_git_version 1.8.0 mkdir "$HOME/.folder" touch "$HOME/.folder/ignored.swp" - $HOMESHICK_FN track rc-files "$HOME/.folder/ignored.swp" + GIT_VERSION=1.8.0 $HOMESHICK_FN track rc-files "$HOME/.folder/ignored.swp" [ ! -e "$HOMESICK/repos/rc-files/home/.folder/ignored.swp" ] [ -e "$HOMESICK/repos/rc-files/home/.folder" ] - # "unmock" git - unset git } @test 'track symlink in $HOME to $HOME' {
