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

Have allsky.sh call variables.sh before starting capture #557

Merged
merged 2 commits into from
Oct 5, 2021

Conversation

linuxkidd
Copy link
Collaborator

Allows all called scripts from capture to not need anything from variables.sh, thus the multi-loading guard in place in variables.sh will prevent unneeded extra work.

@linuxkidd linuxkidd added the bug needs software change label Oct 4, 2021
Copy link
Collaborator

@EricClaeys EricClaeys left a comment

Choose a reason for hiding this comment

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

Michael, I'm curious why you source's variables.sh near the end of the file rather than right before source $ALLSKY_HOME/config.sh, which is where I have it in my test version. Having it higher means config.sh and most of allsky.sh can use the variables in variables.sh.

Also, before you merge this commit, I'd like to add some minor changes to allsky.sh.

@EricClaeys
Copy link
Collaborator

Just looked - we really want the call to variables.sh above the call to config.sh since allsky.sh uses $ALLSKY_HOME/scripts that we need to replace with $ALLSKY_SCRIPTS.

@linuxkidd linuxkidd linked an issue Oct 4, 2021 that may be closed by this pull request
@linuxkidd
Copy link
Collaborator Author

@EricClaeys roger that... moved and updated all instances of $ALLSKY_HOME/scripts and $ALLSKY_HOME/config to use the appropriate variables instead.

Copy link
Collaborator

@EricClaeys EricClaeys left a comment

Choose a reason for hiding this comment

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

I'll add my changes after this PR is merged.

@linuxkidd linuxkidd merged commit 68cb868 into AllskyTeam:master Oct 5, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug needs software change
Projects
None yet
Development

Successfully merging this pull request may close these issues.

*** Waiting for you to fix this. Restart when done fixing. ***
2 participants