jyapayne/anbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #832 from morphis/generate-zip-instead-of-tar

Browse source 
Generate zip instead of a tarball
This commit is contained in:
Simon Fels 2018-07-24 04:18:50 -04:00 • committed by GitHub
commit b5ea0b4d7f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
scripts/collect-bug-info.sh
View file

@ -7,9 +7,7 @@ if [ $(id -u) -ne 0 ] ; then
echo " adding a few important file for bug diagnostics to the report." echo " adding a few important file for bug diagnostics to the report."
echo " If you want to have a look at the script before giving it root" echo " If you want to have a look at the script before giving it root"
echo " access, please have a look at $0." echo " access, please have a look at $0."
echo exit 0
echo "Please press any key to continue"
read -r action
fi fi
echo "This script will collect a few interesting things which developers will" echo "This script will collect a few interesting things which developers will"
@ -30,7 +28,7 @@ cp /var/snap/anbox/common/logs/console.log* $TMPDIR || true
$SNAP/command-anbox.wrapper system-info > $TMPDIR/system-info.log 2>&1 || true $SNAP/command-anbox.wrapper system-info > $TMPDIR/system-info.log 2>&1 || true
if [ -e /etc/systemd/system/snap.anbox.container-manager.service ]; then if [ -e /etc/systemd/system/snap.anbox.container-manager.service ]; then
sudo journalctl --no-pager -u snap.anbox.container-manager.service > $TMPDIR/container-manager.log 2>&1 sudo journalctl --no-pager -u snap.anbox.container-manager.service > $TMPDIR/container-manager.log 2>&1 || true
fi fi
set +x set +x
@ -48,12 +46,12 @@ fi
echo "Generating archive with all log files in $PWD ..." echo "Generating archive with all log files in $PWD ..."
CURDIR=$PWD CURDIR=$PWD
(cd $TMPDIR; tar cJf $CURDIR/anbox-system-diagnostics-$(date --rfc-3339=date --utc).tar.xz *) (cd $TMPDIR; zip -r $CURDIR/anbox-system-diagnostics-$(date --rfc-3339=date --utc).zip *)
rm -rf $TMPDIR rm -rf $TMPDIR
echo "DONE!" echo "DONE!"
echo echo
echo "Now please take the tarball generate in your current directory and" echo "Now please take the ZIP archive generated in your current directory"
echo "attach it to your bug report. Please don't hesitate to have a look" echo "and attach it to your bug report. Please don't hesitate to have a"
echo "into the tarball before you do so to verify you don't leak any" echo "look into the archive before you do so to verify you don't leak any"
echo "information you don't want!" echo "information you don't want!"

4
snap/.snapcraft/state Normal file
View file

@ -0,0 +1,4 @@
!GlobalState
assets:
build-packages: []
build-snaps: []

7
snap/snapcraft.yaml
View file

@ -144,6 +144,13 @@ parts:
stage-packages: stage-packages:
- apparmor - apparmor
zip:
plugin: nil
stage-packages:
- zip
prime:
- usr/bin/zip
lxc: lxc:
source: https://github.com/lxc/lxc source: https://github.com/lxc/lxc
source-type: git source-type: git