Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add getready callout #141

Merged
merged 3 commits into from
May 12, 2015
Merged

Conversation

iglpdc
Copy link
Contributor

@iglpdc iglpdc commented May 7, 2015

This PR in lesson-example add a "getready" callout box in the index.md that can be used to provide the learners with instructions on "what they should do to follow the lessons".

The PR here add the callout box. I've also changed the name of the folder containing Nelle's filesystem from "filesystem" to "data" and make a zip file of it linked in the callout box.

@iglpdc
Copy link
Contributor Author

iglpdc commented May 10, 2015

@ChristinaLK @r-gaia-cs this is how the "getready" callout would work for a lesson that needs some preparation steps.

iglpdc added 3 commits May 10, 2015 11:46
Our lesson tempate says that data files should be in a "data" directory.
The name "filesystem" is not used in the lesson, so we are free to change it.
This also allows to create a script at the lesson-template level to zip this data
easily across different lessons and make them available throught the .getready callout.
@iglpdc iglpdc force-pushed the add-getready-callout branch from 5dd68e1 to e64c8de Compare May 10, 2015 15:46
> 4. You can access this folder from the Unix shell with:
>
> ~~~ {.input}
> $ cd && cd Desktop/shell-novice/data
Copy link
Contributor

Choose a reason for hiding this comment

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

This will work for GNU/Linux distributions but I'm not sure if it will also work for Mac OS X and Windows with Git Bash.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

You mean the cd && cd Desktop?

If so, yes, it works in the 3 OS we use, and AFAIK is the only consistent way to do it.

Copy link
Contributor

Choose a reason for hiding this comment

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

I mean if the directory Desktop exists at that location.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

+> 4. You can access this folder from the Unix shell with:
+>
+> ~~~ {.input}
+> $ cd && cd Desktop/shell-novice/data
I mean if the directory Desktop exists at that location.

It does for MacOS and git-bash on Win. Never tried for Linux, but you say so.

@rgaiacs
Copy link
Contributor

rgaiacs commented May 10, 2015

@iglpdc Thanks a lot for your amazing job with the Git and Shell lesson.

@ChristinaLK
Copy link
Contributor

I made a previous PR to change the filesystem directory name and then reverted (see #77). I do like that using data makes the naming consistent, so as long as there isn't strong outcry that filesystem is a more indicative name, I'm ok w/ this change. :)

Question for @iglpdc : if we ever change the data files (at some point), I assume the zip will have to be updated manually - it's not automatically created via the makefile?

@iglpdc
Copy link
Contributor Author

iglpdc commented May 10, 2015

@ChristinaLK I think the best place to take care of this at the level of lesson-template, because pretty much all our lessons require extra files.

I said in this issue in the python lesson that we could have a post-commit hook or something fancy, but maybe just an extra line to the Makefile would do it. So when we generate the html with make preview, the file is rezipped.

ChristinaLK added a commit that referenced this pull request May 12, 2015
@ChristinaLK ChristinaLK merged commit d4e3ae1 into swcarpentry:gh-pages May 12, 2015
richford pushed a commit to richford/lesson-template that referenced this pull request May 28, 2015
update zip files.

This enhancement grew out of
[issue
94](swcarpentry/python-novice-inflammation#94 (comment))
in the python-novice-inflammation repository and the discussion in a
[shell-novice PR](swcarpentry/shell-novice#141).
It creates a maintainer_hooks directory in the tools directory. Lesson
maintainers can use these hooks by symlinking to them in the .git/hooks
directory. The pre-commit hook sets a "flag" file called .commit and the
post-commit hook detects the presence of this flag and regenerates HTML
and updates the data zip file if necessary. It then amends the previous
commit by adding these files to the commit and keeping the same message.
richford pushed a commit to richford/lesson-template that referenced this pull request May 28, 2015
update zip files.

This enhancement grew out of
[issue
94](swcarpentry/python-novice-inflammation#94)
in the python-novice-inflammation repository and the discussion in a
[shell-novice PR](swcarpentry/shell-novice#141).
It creates a maintainer_hooks directory in the tools directory. Lesson
maintainers can use these hooks by symlinking to them in the .git/hooks
directory. The pre-commit hook sets a "flag" file called .commit and the
post-commit hook detects the presence of this flag and regenerates HTML
and updates the data zip file if necessary. It then amends the previous
commit by adding these files to the commit and keeping the same message.
wking added a commit to wking/workshop-template that referenced this pull request Jan 11, 2016
wking added a commit to wking/workshop-template that referenced this pull request Jan 11, 2016
wking added a commit to wking/workshop-template that referenced this pull request Mar 24, 2016
zkamvar pushed a commit that referenced this pull request May 2, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants