Commit Graph

70 Commits

Author SHA1 Message Date
5ad03c6e46 Merge pull request #175 from gh0stshell/master
Updated bmaptool check #2
2019-10-06 12:27:50 +02:00
eb3836ba1e Fix path to pwnagotchi 2019-10-06 08:55:51 +02:00
2682a5487a Removed extra return 2019-10-05 22:26:03 -07:00
3bb42549f6 BMAPTOOL Check #2 update
switched second check with faster builtin tool, tested fix
2019-10-05 22:25:10 -07:00
0b07bf3621 misc: small fix or general refactoring i did not bother commenting 2019-10-06 00:27:21 +02:00
10a3500d27 Merge pull request #165 from dadav/feature/multi_display_preview
Feature/multi display preview
2019-10-06 00:22:50 +02:00
03318bdaef Change code 2019-10-06 00:18:54 +02:00
6bc507412a pypi upload script 2019-10-06 00:18:36 +02:00
106c87847d typo 2019-10-05 20:23:05 +02:00
6a1a16556e Script will now ask which adaptors it should use instead of trying to find the correct ones by default 2019-10-05 20:15:12 +02:00
6e4fe624ec Fix incorrect config filename in update script
The update script backs up the config file to `/root/config.bak`, but
then tries to restore it from `/root/config.yml.bak` (which obviously
won't be found).

This looks like a typo in the backup command, so update that command to
use the same filename as the restore command.

Signed-off-by: Ross Simpson <ross@rosssimpson.com>
2019-10-04 22:01:44 +10:00
046e9a0fe7 Merge pull request #125 from gh0stshell/master
Updated depends, updated bmap check
2019-10-04 10:40:10 +02:00
01535176ed Update create_sibling.sh
Fixed Array Call for the gender
2019-10-03 19:49:38 -04:00
79871cd291 Updated depends, bmap check update
Removed bmap-tools from depends as the check on line 96 looks for bmaptools and would use it if available if not continue to build, but have it as a depend check made the check null and if someone is on a kernel/file-system that does not support SEEK_HOLE and SEEK_DATA the script just fails.

Fixed bmap-tools check as the line which bmaptool >/dev/null 2>&1 does not return 0 so it kept ending at this line, if bmap-tools were not installed

The original code below looks for sparse to be 0 and if which bmaptool >/dev/null 2>&1 returns 0 to use bmap-tools, but I think its the reverse so swapped the last then and else sections as it would then look if sparse is 0 and which bmaptool >/dev/null 2>&1 is 0 to not use bmap-tools, but if it is 1 to use bmap-tools. If tool is available = 1 use bmap-tools, if tools is unavailable=0 do not use bmap-tools:

if [ "${OPT_SPARSE}" -eq 0 ];
  then
    which bmaptool >/dev/null 2>&1
    if [ $? -eq 0 ];
    then
      echo "[+] Defaulting to sparse image generation as bmaptool is available"
      OPT_SPARSE=1
2019-10-03 16:21:02 -07:00
83705c27f5 Updated depends, bmaptool check update
Removed bmap-tools from depends as the check on line 96 looks for bmaptools and would use it if available if not continue to build, but have it as a depend check made the check null and if someone is on a kernel/file-system that does not support SEEK_HOLE and SEEK_DATA the script just fails.

Fixed bmap-tools check as the line which bmaptool >/dev/null 2>&1 does not return 0 so it kept ending at this line, if bmap-tools were not installed

The original code below looks for sparse to be 0 and if which bmaptool >/dev/null 2>&1 returns 0 to use bmap-tools, but I think its the reverse so swapped the last then and else sections as it would then look if sparse is 0 and which bmaptool >/dev/null 2>&1 is 0 to not use bmap-tools, but if it is 1 to use bmap-tools. If tool is available = 1 use bmap-tools, if tools is unavailable=0 do not use bmap-tools:

if [ "${OPT_SPARSE}" -eq 0 ];
  then
    which bmaptool >/dev/null 2>&1
    if [ $? -eq 0 ];
    then
      echo "[+] Defaulting to sparse image generation as bmaptool is available"
      OPT_SPARSE=1
2019-10-03 16:19:47 -07:00
affb8c27c3 refactor 2019-10-04 00:33:06 +02:00
177804328c updated configure.md and added small note on Create-HNetObjects function 2019-10-03 23:48:36 +02:00
061a5771ae Added powershell script to automate internet connection sharing on windows 2019-10-03 23:44:21 +02:00
92a63c3863 Update File to randomize gender in build scripts 2019-10-03 17:05:07 -04:00
99aa4edbed Merge pull request #100 from dadav/fix/languages
Fix all languages
2019-10-03 17:07:27 +02:00
4cf2866737 new: integrated python standard logger (closes #84) 2019-10-03 17:06:40 +02:00
f0a0bd2fea Fix all languages 2019-10-03 16:59:19 +02:00
335e6b1311 backups 2019-10-03 15:55:03 +02:00
95b9d0ee1e readme config override 2019-10-03 15:02:08 +02:00
6f4eccb317 resolve conflicts 2019-10-03 06:57:55 -05:00
540eb69ead resolve conflict, adjust getopts args, add /etc/motd to backup 2019-10-03 06:49:18 -05:00
5622318e91 new: added changelog script 2019-10-03 13:27:13 +02:00
67a91169df fix: sed for macOS is 'special' ... 2019-10-03 13:22:46 +02:00
d4a45f1b43 release script 2019-10-03 13:03:10 +02:00
961b4250de Update update_pwnagotchi.sh 2019-10-03 00:58:23 -07:00
f108ed95a7 added hostname backup and restore
https://github.com/evilsocket/pwnagotchi/issues/69#issue-501710314

Couldn't decide if it should be a separate option by itself, but I personally think they do go hand in hand.
2019-10-02 23:12:57 -07:00
690f59a846 adding /etc/network/interfaces from PR#71 2019-10-02 16:16:43 -05:00
66ef818ec8 fixing perms on script and uncommenting line from debugging 2019-10-02 16:11:51 -05:00
6d2af37203 fixing getopts, adding host specific files to backup, refactoring 2019-10-02 14:05:22 -05:00
f6b3f705d3 Merge pull request #62 from massar/noSoptionneeded
The -S option does not exist, as it is automatically detected (OPT_SPARSE)
2019-10-02 19:05:38 +02:00
b948627bd5 Fix CRLF line endings...
Before:
```
bash: ./update_pwnagotchi.sh: /bin/bash^M: bad interpreter: No such file or directory
```

Thus:
```
scripts/update_pwnagotchi.sh: Bourne-Again shell script text executable, ASCII text, with CRLF line terminators

dos2unix: converting file scripts/update_pwnagotchi.sh to Unix format...

scripts/update_pwnagotchi.sh: Bourne-Again shell script text executable, ASCII text
```

Now it works :)
2019-10-02 19:03:50 +02:00
58edfd2a4b The -S option does not exist, as it is automatically detected (OPT_SPARSE) 2019-10-02 18:25:18 +02:00
96816d474c Default to 8GB images
Currently it's not possible to build images with 4GB, therefor 8GB should be default.
2019-10-02 14:49:39 +02:00
9504f46bd6 Merge pull request #38 from dadav/fix/add_rest_of_emotions
Add rest of emotions
2019-10-02 13:09:43 +02:00
505c616e1d Merge pull request #40 from justin-p/update_script
Update script
2019-10-02 13:09:30 +02:00
6bd4874d45 Merge pull request #41 from massar/bmap
Enable detection of bmaptool, and if present generate sparse files.
2019-10-02 13:08:45 +02:00
d86946813d Merge pull request #39 from strasharo/patch-1
Fix for the segmentation fault in qemu
2019-10-02 13:07:25 +02:00
4c20314c90 Update dependencies, as travis needs bmap-tools now to perform CI 2019-10-02 11:57:25 +02:00
4aa2665daf Add -A option so that one can pass in the URL of a APT Proxy (eg apt-cacher-ng) so that rebuilding is much faster 2019-10-02 11:53:18 +02:00
a4e2fe02b6 Enable detection of bmaptool, and if present generate sparse files.
This uses https://github.com/intel/bmap-tools to generate a .bmap file
which can be copied around. The bmaptool allows storing sparse files
onto for instance an SD card, thus avoiding having to transfer the full
disk image every time one burns one.
Thus saving lots of time (and SD card cycles).

This also adds some instructions for then transfering and copying the
sparse file.

bmaptool: info: discovered bmap file '/Users/jeroen/berry.img.bmap'
bmaptool: info: block map format version 2.0
bmaptool: info: 7324219 blocks of size 4096 (27.9 GiB), mapped 1539940 blocks (5.9 GiB or 21.0%)
bmaptool: info: copying image 'berry.img' to file 'rdisk4' using bmap file 'berry.img.bmap'
bmaptool: info: 100% copied
bmaptool: info: synchronizing '/dev/rdisk4'
bmaptool: info: copying time: 6m 49.7s, copying speed 14.7 MiB/sec

versus copying the whole 30G which would take forever...
2019-10-02 11:33:07 +02:00
bc2bca79b5 updated arguments to getopts. Added -m for restart mode. Moved prerequisites checks. 2019-10-02 10:40:16 +02:00
cd5be9c4cd Add /boot. Redo help. Replaced --commit/--branch with --version. Added --url to easly switch to other fork for testing 2019-10-02 10:14:26 +02:00
a495ffb136 Add update script 2019-10-02 00:29:14 +02:00
30744a8dd5 Fix for the segmentation fault in qemu
Without this I'm getting a constant segmentation fault when running go under qemu on Fedora 30:

+ export GOPATH=/root/go
+ GOPATH=/root/go
+ go get -u github.com/bettercap/bettercap
qemu: uncaught target signal 11 (Segmentation fault) - core dumped
bin/bash: line 52: 23146 Segmentation fault      (core dumped) go get -u github.com/bettercap/bettercap

https://bugs.launchpad.net/qemu/+bug/1696773
2019-10-01 23:52:59 +03:00
a004125bde Add rest of emotions 2019-10-01 21:52:35 +02:00