Commit Graph

54 Commits

Author SHA1 Message Date
framp 8aae06a4b2 Modified cleanup 2018-03-24 12:01:59 +01:00
framp 3dbbbd6df6 merge 2018-02-14 20:08:05 +01:00
framp 67add2e613 Added cleanup function trap 2018-02-14 20:07:11 +01:00
framp eda1092cc5 Added cleanup function trap 2018-02-14 20:05:03 +01:00
Drew Bonasera 83e72eeec3
Add NOOBS warning to README 2018-02-03 18:00:44 -05:00
Drew Bonasera eac933beb8 Add `-a minimal` to parted call to fix errors with some images 2018-02-03 17:38:31 -05:00
Drew Bonasera 54051ea2e3
Merge pull request #43 from framps/master
Added installation instructions in README
2018-02-03 17:03:32 -05:00
Drew Bonasera 551e9950ac
Reorder Readme 2018-02-03 17:02:23 -05:00
Drew Bonasera 8dccf7d154
Merge pull request #40 from lurch/various-tweaks
Various tweaks
2018-02-03 16:53:34 -05:00
Andrew Scheller 3568798dd4 Give the new file the same ownership as the old file
(instead of having it always owned just by root)
2018-01-29 09:58:24 +00:00
Andrew Scheller 201db16c93 Replace `expr` with bash built-in arithmetic, and tidy up free-space calculation 2018-01-29 09:58:24 +00:00
Andrew Scheller 8331faf8f3 Check for additional required commands 2018-01-29 09:58:24 +00:00
Andrew Scheller e3ff4d20aa Double-quote all the filenames 2018-01-29 09:58:24 +00:00
Andrew Scheller ec95ba8097 `ls` doesn't need `-a` flag when passed a filename 2018-01-29 09:57:19 +00:00
Andrew Scheller c69f57affe Tighten up grep matches 2018-01-29 09:57:19 +00:00
Andrew Scheller 8784bda989 Avoid calling identical commands multiple times 2018-01-29 09:57:19 +00:00
Andrew Scheller 49964b512c Remove the unnecessary `tr -d '\n'` parts 2018-01-29 09:57:19 +00:00
Andrew Scheller 0b19d6c6ea Add the -s flag to all parted commands 2018-01-29 09:57:19 +00:00
Andrew Scheller b787dd4e66 Always quote echo strings 2018-01-29 09:57:19 +00:00
Andrew Scheller b11de9a8ee Remove unused variables 2018-01-29 09:57:19 +00:00
Andrew Scheller 9d6392d0c2 Use $() for command-substitution instead of backticks 2018-01-29 09:57:19 +00:00
framp 2d2c4d5802 Added installation instructions in README 2018-01-27 20:45:32 +01:00
Drew Bonasera 2aa44f0ecd
Fix error return value
Closes #39
2018-01-27 00:03:04 -05:00
Drew Bonasera e7857ff47c
Merge pull request #38 from lurch/patch-1
Don't allow a directory to be selected
2018-01-21 17:58:56 -05:00
Andrew Scheller 2229ae89a6
Don't allow a directory to be selected
The `-e` flag checks for a file _or_ a directory of that name. The `-f` flag checks only for files.
2018-01-21 22:08:43 +00:00
Drew Bonasera c40b443072
Merge pull request #34 from framps/master
Autorepair e2fsck errors
Closes #32
2018-01-16 00:52:54 -05:00
Drew Bonasera 5a89ff4262
Fix typos in README 2018-01-16 00:40:29 -05:00
framp f83e3f341d Autorepair fsck errors 2017-12-29 18:03:11 +01:00
Drew Bonasera da3bf15dac
Merge pull request #31 from framps/master
Handle filenames with spaces
Fixes #30
2017-12-07 00:17:18 -05:00
framp 4af698457e Accept filenames with spaces 2017-12-02 23:18:54 +01:00
Drew Bonasera ff89083249 Update auto expanding script
It now attempts to use raspi-config and falls back on the (updated) hard coded procedure. This should
help prevent some incompatibility issues.
2017-10-24 03:50:46 -04:00
Drew Bonasera 63b7509ade Merge pull request #15 from shatteredsword/master
reverted to using raspi-config to be used for automatic image resizing
Closes #18
2017-07-15 00:40:28 -04:00
Drew Bonasera e326f426bb Merge pull request #17 from raspberrycoulis/patch-1
Update README.md
2017-07-12 22:34:09 -04:00
Wesley Archer f5246e8898 Update README.md
Added prerequisite about needing Ubuntu 16.10 and upwards to prevent e2fsck and metatdata_csum error message.
2017-07-12 16:35:15 +01:00
Sean Mayo 0b04de8118 reverted to using raspi-config to be used for automatic image resizing
while not having to rely on the raspi-config tool does make the pishrink utility more portable, the raspi-config tool is already properly maintained. rather than being forced to maintain the autosizing utility in this script (which has already been broken for several months due to a linux kernal change), it just makes more sense to not have to rewrite properly maintained code.
2017-07-07 15:53:20 -07:00
Drew Bonasera 9b55197d9b Remove need for raspi-config to be installed on the image for resizing.
Closes #8
2016-10-31 01:42:34 -04:00
Drew Bonasera 75dafa2801 Fix spacing 2016-08-22 04:11:37 -04:00
Drew Bonasera ba76ae0063 Merge pull request #7 from carlfj/fix-indents-for-md5sum
New indents broke rc.local md5sum, startup script
2016-08-17 21:22:06 -04:00
Carl Jensen 8388774c3e New indents broke rc.local md5sum, startup script
The indentation was introduced in cad2e0e11a, not when the safety hash check was added in 2c6f069c2f, my first guess.
The indentations makes the rc.local begin with spaces instead of `#!/bin/bash` and will not run. But it gets better.
The md5 safety check is based on rc.local without indents, so after the added indentations the if-block will never be skipped. If the script is run a second time, the original rc.local backed up in rc.local.bak will be overwritten, and on boot result in a never ending loop, trying to expand the filesystem each time. A user could run the pishrink.sh a second time on a disk image, e.g. after making more edits.
2016-08-18 03:01:14 +02:00
Drew Bonasera abb17e217e Merge pull request #5 from rbaumbach/master
Add getops to script to provide user the ability to skip autoexpanding
2016-07-13 15:44:08 -04:00
rbaumbach cad2e0e11a
Add getops to script to provide user the ability to skip autoexpanding process of the script 2016-07-09 20:45:54 -07:00
Drew Bonasera 816e1efa15 update readme 2016-07-07 01:33:43 -04:00
Drew Bonasera c519a658c7 Fix issue #4 where the script tries to resize to a larger or equal size 2016-07-07 01:28:32 -04:00
Drew Bonasera 0b8020ac18 Change parameters to cp for image copy
This will speed up the copy process on some filesystems by writing less to the disk. CoW filesystems will perform the best
2016-04-28 02:10:01 -04:00
Drew Bonasera ed4bcea683 Add option to copy to new file before script executes
While not the most efficient method it will at least work for now

Closes issue #1 and issue #3
2016-04-28 01:35:12 -04:00
Drew Bonasera 1f91ea1f87 Add warning to backup 2016-04-27 04:38:35 -04:00
Drew Bonasera f45603840e Change to pull partition number from the image rather than hardcoded 2016-04-27 04:33:21 -04:00
Drew Bonasera e3b321a9d7 Remove bc dependency by replacing with expr 2016-04-27 04:32:22 -04:00
Drew Bonasera f4282842da Remove the use of awk
The awks being used were not reliably giving the correct data across different distros. They were
replaced with cut and tr, this should give the script better stability.
2016-04-27 02:10:23 -04:00
Drew Bonasera 33aeacb375 Add checks for parted and bc being installed. These are most likely to
be missing on distros.
2016-04-26 12:05:00 -04:00