docker build arg

.travis.yml

@@ -4,5 +4,7 @@ service:
   - docker
 script:
   - ./shellcheck.sh
-  - docker image build -t kazhala/dotbare:test -f tests/Dockerfile .
-  - docker container run -it --rm --name dotbare kazhala/dotbare:test
+  - docker image build --build-arg MIGRATE=url -t kazhala/dotbare:testurl -f tests/Dockerfile .
+  - docker container run -it --rm --name dotbare kazhala/dotbare:testurl
+  - docker image build --build-arg MIGRATE=bare -t kazhala/dotbare:testbare -f tests/Dockerfile .
+  - docker container run -it --rm --name dotbare kazhala/dotbare:testbare

buildspec.yml

@@ -10,7 +10,11 @@ phases:
     commands:
       - echo Checking script compliance
       - ./shellcheck.sh
-      - echo Building docker image ...
-      - docker image build -t kazhala/dotbare:test -f tests/Dockerfile .
+      - echo Building docker url image ...
+      - docker image build --build-arg MIGRATE=url -t kazhala/dotbare:testurl -f tests/Dockerfile .
       - echo Running bats unittest ...
-      - docker container run -i --rm --name dotbare kazhala/dotbare:test
+      - docker container run -i --rm --name dotbare kazhala/dotbare:testurl
+      - echo Building docker bare image ...
+      - docker image build --build-arg MIGRATE=bare -t kazhala/dotbare:testbare -f tests/Dockerfile .
+      - echo Running bats unittest ...
+      - docker container run -i --rm --name dotbare kazhala/dotbare:testbare

scripts/fbackup

@@ -76,11 +76,6 @@ done
 
 [[ -n "${selected_files}" ]] && dotbare_backup "${selected_files}" "${action_command}"
 
-[[ ! -d "${DOTBARE_DIR}" ]] \
-  && echo "Could not locate your DOTBARE_DIR" \
-  && echo "Run dotbare finit or dotbare finit -u URL to initialise dotbare" \
-  && exit 1
-
 cd "${DOTBARE_TREE}"
 if [[ -n "${individual_file}" ]]; then
   selected_files=$(get_git_file "select files to backup" "raw")
@@ -89,4 +84,5 @@ else
     ls-files --full-name --directory "${DOTBARE_TREE}")
 fi
 
+[[ -z "${selected_files}" ]] && exit 0
 dotbare_backup "${selected_files}" "${action_command}"

tests/Dockerfile

@@ -4,5 +4,7 @@ RUN apk add --no-cache fzf
 ADD ./ /root/dotbare
 RUN echo "PATH=$PATH:$HOME/dotbare" >> "$HOME"/.bashrc
 WORKDIR /root/dotbare
-RUN ./dotbare finit -u https://github.com/kazhala/dotfiles.git
+ARG MIGRATE='url'
+RUN [ "$MIGRATE" = 'url' ] && ./dotbare finit -u https://github.com/kazhala/dotfiles.git || :
+RUN [ "$MIGRATE" = 'bare' ] && export confirm='y' && ./dotbare finit || :
 ENTRYPOINT ["bats", "tests"]