Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: indigen-solutions/indi-backup
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.3.2
Choose a base ref
...
head repository: indigen-solutions/indi-backup
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Jan 25, 2018

  1. Fix #2

    @jerome-quere
    jerome-quere committed Jan 25, 2018
    Copy the full SHA
    c4d87b2 View commit details

  2. Add change log

    @jerome-quere
    jerome-quere committed Jan 25, 2018
    Copy the full SHA
    be0fb7b View commit details
Showing with 10 additions and 3 deletions.
  1. +6 −0 debian/changelog
  2. +3 −2 debian/create-deb.sh
  3. +1 −1 lib/storages/ssh.sh
6 changes: 6 additions & 0 deletions debian/changelog
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
indi-backup (0.3.3-0-gc4d87b2) unstable; urgency=medium

* Release 0.3.3-0-gc4d87b2

-- Jerome Quere <jerome.quere@indigen.com> Thu, 25 Jan 2018 17:04:25 +0000

indi-backup (0.3.1-0-gd363938) unstable; urgency=medium

* Release 0.3.1-0-gd363938
5 changes: 3 additions & 2 deletions debian/create-deb.sh
View file
Original file line number Diff line number Diff line change
@@ -10,12 +10,13 @@ DEBEMAIL=$DEBEMAIL dch -r $VERSION
tar -cJf ../${SOURCE}_${SHORT_VERSION}.orig.tar.xz *

debuild
debuild clean

rm -f ../${SOURCE}_${VERSION}*.build
rm -f ../${SOURCE}_${VERSION}*.changes
rm -f ../${SOURCE}_${VERSION}*.tar.xz
rm -f ../${SOURCE}_${VERSION}*.dsc
rm -f ../${SOURCE}_${SHORT_VERSION}.orig.tar.xz
mv ../${SOURCE}_${VERSION}_all.deb .

popd > /dev/null

debuild -- clean
2 changes: 1 addition & 1 deletion lib/storages/ssh.sh
View file
Original file line number Diff line number Diff line change
@@ -95,6 +95,6 @@ function ib_storage_ssh_prune() {
ib_should_be_prune "${backup}" "$retention" && toRemove="${toRemove} \"${dirName}/${backup}\""
done

ssh $sshKey -p "${sshPort}" "${sshUser}@${sshHost}" "rm -r ${toRemove}"
[ ! -z "$toRemove" ] && ssh $sshKey -p "${sshPort}" "${sshUser}@${sshHost}" "rm -r ${toRemove}"
return 0
}