Skip to content

Commit

Permalink
Remove an unused var and let build-release scp the files (#4150) (#4151)
Browse files Browse the repository at this point in the history
Just noticed a warning while building 6.1.1, pls one less copy/paste thing for me to do during release.

Co-authored-by: Paul Wessel <[email protected]>
  • Loading branch information
github-actions[bot] and PaulWessel authored Sep 1, 2020
1 parent 60ab88b commit 4d9bc24
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
4 changes: 3 additions & 1 deletion admin/build-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -125,4 +125,6 @@ echo "build-release.sh: Place gmt-${Version}-src.tar.* on the ftp site" >&2
if [ -f gmt-${Version}-darwin-x86_64.dmg ]; then
echo "build-release.sh: Place gmt-${Version}-darwin-x86_64.dmg on the ftp site" >&2
fi
#scp gmt-${Version}-darwin-x86_64.dmg gmt-${Version}-src.tar.* ftp:/export/ftp1/ftp/pub/pwessel/release
if [ "${USER}" = "pwessel" ]; then # Place file in pwessel SOEST ftp release directory
scp gmt-${Version}-darwin-x86_64.dmg gmt-${Version}-src.tar.* ftp.soest.hawaii.edu:/export/ftp1/ftp/pub/pwessel/release
fi
7 changes: 2 additions & 5 deletions src/postscriptlight.c
Original file line number Diff line number Diff line change
Expand Up @@ -4860,7 +4860,7 @@ void psl_got_composite_fontswitch (struct PSL_CTRL *PSL, char *text) {
* We look for such cases and count the occurrences, plus replace the font changing code
* @ (either @~ or @%font% with ASCII escape (27)). */
size_t k;
int n = 0, step;
int n = 0;
for (k = 0; k < strlen (text); k++) {
if (text[k] != '@') continue;
/* Start of an escape sequence */
Expand All @@ -4872,14 +4872,11 @@ void psl_got_composite_fontswitch (struct PSL_CTRL *PSL, char *text) {
/* Here we do have such a thing, and we need to avoid the regular string splitting at @ in PSL_plottext and PSL_deftextdim */
text[k] = PSL_ASCII_ES; /* Replace @ with ASCII ESC code for now */
k++; /* Font code type is ~ or % */
if (text[k] == '~') { /* Symbol font */
if (text[k] == '~') /* Symbol font */
k++; /* Step to character2 */
step = 1; /* Since we will toggle back with @~ */
}
else { /* Some random font switch */
k++; /* Step past first % */
while (text[k] != '%') k++; /* Skip past the font name or number */
step = 2; /* Since we will toggle back with @%% */
k++; /* Step to character2 */
}
if (text[k] == '\\') k += 4; else k++; /* Skip the octal or regular second character */
Expand Down

0 comments on commit 4d9bc24

Please sign in to comment.