Skip to content

Commit

Permalink
Prepare for release v1.7
Browse files Browse the repository at this point in the history
  • Loading branch information
jarun committed Oct 7, 2017
1 parent 4868954 commit 9dbdee0
Show file tree
Hide file tree
Showing 5 changed files with 76 additions and 67 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ script:
before_deploy:
- sudo apt-get update -qy
- sudo apt-get install -qy python3 python3-pip
- python3 -m pip install packagecore
- sudo python3 -m pip install packagecore
- packagecore -o dist/ "${TRAVIS_TAG#v}"

deploy:
Expand Down
9 changes: 9 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
bcal 1.7
2016-10-10

What's in?
- PackageCore integration
- Automated testing in Travis CI

-------------------------------------------------------------------------------

bcal 1.6
2017-06-30

Expand Down
64 changes: 32 additions & 32 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,44 +88,44 @@ To uninstall, run:

```
usage: bcal [-c N] [-f FORMAT] [-s bytes] [-d] [-h]
[expression] [N unit]
[expression] [N unit]
Perform storage conversions and calculations.
positional arguments:
expression evaluate storage arithmetic expression
+, -, *, / with decimal inputs supported
unit can be multiplied or divided by +ve integers
units can be added or subtracted from each other
Examples:
bcal "(5kb+2mb)/3"
bcal "5 tb / 12"
bcal "2.5mb*3"
N [unit] capacity in B/KiB/MiB/GiB/TiB/kB/MB/GB/TB
see https://wiki.ubuntu.com/UnitsPolicy
default unit is B (byte), case is ignored
N can be decimal or '0x' prefixed hex value
expression evaluate storage arithmetic expression
+, -, *, / with decimal inputs supported
unit can be multiplied or divided by +ve integers
units can be added or subtracted from each other
Examples:
bcal "(5kb+2mb)/3"
bcal "5 tb / 12"
bcal "2.5mb*3"
N [unit] capacity in B/KiB/MiB/GiB/TiB/kB/MB/GB/TB
see https://wiki.ubuntu.com/UnitsPolicy
default unit is B (byte), case is ignored
N can be decimal or '0x' prefixed hex value
optional arguments:
-c N show +ve integer N in binary, decimal and hex
-f FORMAT convert CHS to LBA or LBA to CHS
formats are hyphen-separated
LBA format:
starts with 'l':
lLBA-MAX_HEAD-MAX_SECTOR
CHS format:
starts with 'c':
cC-H-S-MAX_HEAD-MAX_SECTOR
omitted values are considered 0
FORMAT 'c-50--0x12-' denotes:
C = 0, H = 50, S = 0, MH = 0x12, MS = 0
FORMAT 'l50-0x12' denotes:
LBA = 50, MH = 0x12, MS = 0
default MAX_HEAD: 16, default MAX_SECTOR: 63
-s bytes sector size [default 512]
-m show minimal output (e.g. decimal bytes)
-d enable debug information and logs
-h show this help and exit
-c N show +ve integer N in binary, decimal and hex
-f FORMAT convert CHS to LBA or LBA to CHS
formats are hyphen-separated
LBA format:
starts with 'l':
lLBA-MAX_HEAD-MAX_SECTOR
CHS format:
starts with 'c':
cC-H-S-MAX_HEAD-MAX_SECTOR
omitted values are considered 0
FORMAT 'c-50--0x12-' denotes:
C = 0, H = 50, S = 0, MH = 0x12, MS = 0
FORMAT 'l50-0x12' denotes:
LBA = 50, MH = 0x12, MS = 0
default MAX_HEAD: 16, default MAX_SECTOR: 63
-s bytes sector size [default 512]
-m show minimal output (e.g. decimal bytes)
-d enable debug information and logs
-h show this help and exit
```

#### Operational notes
Expand Down
2 changes: 1 addition & 1 deletion bcal.1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH "BCAL" "1" "Jun 2017" "Version 1.6" "User Commands"
.TH "BCAL" "1" "10 Oct 2017" "Version 1.7" "User Commands"
.SH NAME
bcal \- Perform storage conversions and calculations.
.SH SYNOPSIS
Expand Down
66 changes: 33 additions & 33 deletions src/bcal.c
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ typedef struct {
ulong s;
} t_chs;

static char *VERSION = "1.6";
static char *VERSION = "1.7";
static char *units[] = {"b", "kib", "mib", "gib", "tib", "kb", "mb", "gb", "tb"};

static char uint_buf[UINT_BUF_LEN];
Expand Down Expand Up @@ -769,41 +769,41 @@ static bool lba2chs(char *lba, t_chs *p_chs)
static void usage(void)
{
printf("usage: bcal [-c N] [-f FORMAT] [-s bytes] [-d] [-h]\n\
[expression] [N unit] \n\n\
[expression] [N unit] \n\n\
Perform storage conversions and calculations.\n\n\
positional arguments:\n\
expression evaluate storage arithmetic expression\n\
+, -, *, / with decimal inputs supported\n\
unit can be multiplied or divided by +ve integers\n\
units can be added or subtracted from each other\n\
Examples:\n\
bcal \"(5kb+2mb)/3\"\n\
bcal \"5 tb / 12\"\n\
bcal \"2.5mb*3\"\n\
N [unit] capacity in B/KiB/MiB/GiB/TiB/kB/MB/GB/TB\n\
see https://wiki.ubuntu.com/UnitsPolicy\n\
default unit is B (byte), case is ignored\n\
N can be decimal or '0x' prefixed hex value\n\n\
expression evaluate storage arithmetic expression\n\
+, -, *, / with decimal inputs supported\n\
unit can be multiplied or divided by +ve integers\n\
units can be added or subtracted from each other\n\
Examples:\n\
bcal \"(5kb+2mb)/3\"\n\
bcal \"5 tb / 12\"\n\
bcal \"2.5mb*3\"\n\
N [unit] capacity in B/KiB/MiB/GiB/TiB/kB/MB/GB/TB\n\
see https://wiki.ubuntu.com/UnitsPolicy\n\
default unit is B (byte), case is ignored\n\
N can be decimal or '0x' prefixed hex value\n\n\
optional arguments:\n\
-c N show +ve integer N in binary, decimal and hex\n\
-f FORMAT convert CHS to LBA or LBA to CHS\n\
formats are hyphen-separated\n\
LBA format:\n\
starts with 'l':\n\
lLBA-MAX_HEAD-MAX_SECTOR\n\
CHS format:\n\
starts with 'c':\n\
cC-H-S-MAX_HEAD-MAX_SECTOR\n\
omitted values are considered 0\n\
FORMAT 'c-50--0x12-' denotes:\n\
C = 0, H = 50, S = 0, MH = 0x12, MS = 0\n\
FORMAT 'l50-0x12' denotes:\n\
LBA = 50, MH = 0x12, MS = 0\n\
default MAX_HEAD: 16, default MAX_SECTOR: 63\n\
-s bytes sector size [default 512]\n\
-m show minimal output (e.g. decimal bytes)\n\
-d enable debug information and logs\n\
-h show this help and exit\n\n\
-c N show +ve integer N in binary, decimal and hex\n\
-f FORMAT convert CHS to LBA or LBA to CHS\n\
formats are hyphen-separated\n\
LBA format:\n\
starts with 'l':\n\
lLBA-MAX_HEAD-MAX_SECTOR\n\
CHS format:\n\
starts with 'c':\n\
cC-H-S-MAX_HEAD-MAX_SECTOR\n\
omitted values are considered 0\n\
FORMAT 'c-50--0x12-' denotes:\n\
C = 0, H = 50, S = 0, MH = 0x12, MS = 0\n\
FORMAT 'l50-0x12' denotes:\n\
LBA = 50, MH = 0x12, MS = 0\n\
default MAX_HEAD: 16, default MAX_SECTOR: 63\n\
-s bytes sector size [default 512]\n\
-m show minimal output (e.g. decimal bytes)\n\
-d enable debug information and logs\n\
-h show this help and exit\n\n\
Version %s\n\
Copyright © 2016-2017 Arun Prakash Jana <[email protected]>\n\
License: GPLv3\n\
Expand Down

5 comments on commit 9dbdee0

@jarun
Copy link
Owner Author

@jarun jarun commented on 9dbdee0 Oct 7, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@shaggytwodope @szlin bcal v1.7 is released! This is a minor release.

@professorjamesmoriarty
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jarun AUR updated PPA builds in progress. Should be published within the hour.

@jarun
Copy link
Owner Author

@jarun jarun commented on 9dbdee0 Oct 7, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

@szlin
Copy link
Collaborator

@szlin szlin commented on 9dbdee0 Oct 8, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The new version of bcal has been updated, thanks @jarun !

@jarun
Copy link
Owner Author

@jarun jarun commented on 9dbdee0 Oct 8, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks Lin!

Please sign in to comment.