Conky weather+moon scripts (Accuw/WUndergr/NWS/MoonGiant)

TeoBigusGeekus · 2019-10-03 21:14:35

No, it's exactly the same as it was before.
I switched to the random_photo branch, launched conky and had the auxiliary files (hourly_raw, curr_cond, etc.) created.
Killed conky, switched to the master branch and there they were again. Deleted them, switched to the random_photo branch and they remained deleted...

morfik · 2019-10-03 21:15:47

Show:

$ git log --all --oneline --graph --decorate --abbrev-commit

TeoBigusGeekus · 2019-10-03 21:15:49

Here's the graph

$ git log --all --oneline --graph --decorate --abbrev-commit
*   97a6fa6 (refs/stash) WIP on master: adf9acb Changed downloader again
|\  
| * 1814270 index on master: adf9acb Changed downloader again
|/  
| * 581433a (HEAD -> random_photo) test
| * e46a937 test
| * 251d431 test
| * e7b4770 test
| *   ffe3454 Merge branch 'master' into random_photo
| |\  
| | * 93ceae7 Changed downloader again
| |/  
|/|   
| * ca8cb6e test commit
| * d68d006 test commit
| * 53a1b6a Made my custom changes to the script
|/  
* adf9acb (origin/master, master) Changed downloader again
* b4c5f50 Changed downloader again
* a3595b7 Final Release
* 76a5cd3 Release Candidate 3
*   909a3a9 Merge branch 'master' of https://gitlab.com/teobigusgeekus/1_accuweather
|\  
| * fa02456 Add CHANGELOG
* | f7b6b02 Release Candidate 2
|/  
* 804f598 Release Candidate 2

morfik · 2019-10-03 21:18:49

They have the same starting point now, so like in the previous example, all files that you create in the either of the branches will show in both of them till you commit something in either one. Make a test commit in the master branch. You can always reset the head by one commit, to back where you were.

Also -- what did you do in 97a6fa6 ?

Last edited by morfik (2019-10-03 21:21:40)

TeoBigusGeekus · 2019-10-03 21:22:40

[[Time:00:16 Location:~/1_accuweather]]
$ git branch
  master
* random_photo
[[Time:00:16 Location:~/1_accuweather]]
$ git checkout master
Switched to branch 'master'
Your branch is up to date with 'origin/master'.
[[Time:00:16 Location:~/1_accuweather]]
$ git commit -m "test commit to fix master"
On branch master
Your branch is up to date with 'origin/master'.

nothing to commit, working tree clean
[[Time:00:17 Location:~/1_accuweather]]
$ git checkout random_photo
Switched to branch 'random_photo'
[[Time:00:17 Location:~/1_accuweather]]
$ git commit -m "test commit to fix master"
On branch random_photo
nothing to commit, working tree clean
[[Time:00:17 Location:~/1_accuweather]]
$ git checkout master
Switched to branch 'master'
Your branch is up to date with 'origin/master'.
[[Time:00:17 Location:~/1_accuweather]]
$

The behavior is the same as before.

TeoBigusGeekus · 2019-10-03 21:23:38

morfik wrote:

Also -- what did you do in 97a6fa6 ?

That's when I stashed.

TeoBigusGeekus · 2019-10-03 21:24:24

At this point, may I suggest that I delete everything and create a new repository?

Or, alternatively, call an exorcist?

Last edited by TeoBigusGeekus (2019-10-03 21:24:46)

morfik · 2019-10-03 21:24:28

What happens when you reset head by one commit? Pay attention to the graph.

Last edited by morfik (2019-10-03 21:24:45)

TeoBigusGeekus · 2019-10-03 21:29:07

$ git log --all --oneline --graph --decorate --abbrev-commit
*   15abd46 (refs/stash) WIP on master: b4c5f50 Changed downloader again
|\  
| * 34eb5c3 index on master: b4c5f50 Changed downloader again
|/  
| * 581433a (random_photo) test
| * e46a937 test
| * 251d431 test
| * e7b4770 test
| *   ffe3454 Merge branch 'master' into random_photo
| |\  
| | * 93ceae7 Changed downloader again
| * | ca8cb6e test commit
| * | d68d006 test commit
| * | 53a1b6a Made my custom changes to the script
| |/  
| * adf9acb Changed downloader again
|/  
* b4c5f50 (HEAD -> master, origin/master) Changed downloader again
* a3595b7 Final Release
* 76a5cd3 Release Candidate 3
*   909a3a9 Merge branch 'master' of https://gitlab.com/teobigusgeekus/1_accuweather
|\  
| * fa02456 Add CHANGELOG
* | f7b6b02 Release Candidate 2
|/

It undid the stash, which I had to do again in order to switch branches. Files' behavior the same throughout all the stages.

morfik · 2019-10-03 21:30:00

But it's the case, Just reset the head by 1 commit, and show `git status`, and also show the graph when you reset the head.

Last edited by morfik (2019-10-03 21:32:18)

TeoBigusGeekus · 2019-10-03 21:32:09

$ git reset HEAD~1
Unstaged changes after reset:
M       1_accuweather
M       CHANGELOG
[[Time:00:28 Location:~/1_accuweather]]
$ git status
On branch master
Your branch is behind 'origin/master' by 1 commit, and can be fast-forwarded.
  (use "git pull" to update your local branch)

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
        modified:   1_accuweather
        modified:   CHANGELOG

no changes added to commit (use "git add" and/or "git commit -a")

morfik · 2019-10-03 21:34:50

Why is it now "Your branch is behind 'origin/master' by 1 commit,"?

Show:
$ git log --all --oneline --graph --decorate --abbrev-commit

TeoBigusGeekus · 2019-10-03 21:35:19

Graph

$ git log --all --oneline --graph --decorate --abbrev-commit
*   15abd46 (refs/stash) WIP on master: b4c5f50 Changed downloader again
|\  
| * 34eb5c3 index on master: b4c5f50 Changed downloader again
|/  
| * 581433a (random_photo) test
| * e46a937 test
| * 251d431 test
| * e7b4770 test
| *   ffe3454 Merge branch 'master' into random_photo
| |\  
| | * 93ceae7 Changed downloader again
| * | ca8cb6e test commit
| * | d68d006 test commit
| * | 53a1b6a Made my custom changes to the script
| |/  
| * adf9acb Changed downloader again
|/  
* b4c5f50 (origin/master) Changed downloader again
* a3595b7 (HEAD -> master) Final Release
* 76a5cd3 Release Candidate 3
*   909a3a9 Merge branch 'master' of https://gitlab.com/teobigusgeekus/1_accuweather
|\  
| * fa02456 Add CHANGELOG
* | f7b6b02 Release Candidate 2
|/  
* 804f598 Release Candidate 2

TeoBigusGeekus · 2019-10-03 21:36:13

morfik wrote:

Why is it now "Your branch is behind 'origin/master' by 1 commit,"?
Show:
$ git log --all --oneline --graph --decorate --abbrev-commit

Maybe because I forced pushed it to gitlab the last time.

morfik · 2019-10-03 21:37:37

But you had your local master and remote master in sync.

What about:
$ git remote update && git status

TeoBigusGeekus · 2019-10-03 21:38:57

$ git remote update && git status
Fetching origin
On branch master
Your branch is behind 'origin/master' by 1 commit, and can be fast-forwarded.
  (use "git pull" to update your local branch)

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
        modified:   1_accuweather
        modified:   CHANGELOG

no changes added to commit (use "git add" and/or "git commit -a")

morfik · 2019-10-03 21:42:02

So you reset too far. Show:

$ git diff master origin/master

Last edited by morfik (2019-10-03 21:42:34)

TeoBigusGeekus · 2019-10-03 21:44:11

$ git diff master origin/master
diff --git a/1_accuweather b/1_accuweather
index 8d7d554..4e42687 100755
--- a/1_accuweather
+++ b/1_accuweather
@@ -304,10 +304,10 @@ if [[ $forecast0 == 1 || $forecast2015 == 1 || $forecast2016 == 1 ]]; then
        }
 
        curr_addr="$(echo $address|sed 's/weather-forecast.*$//')"current-weather/"$last_number"
-       w3m -dump_source "$curr_addr" -o accept_encoding='identity;q=0' > $HOME/1_accuweather/curr_cond_raw
+       wget -U "Oh hi Mark!" -O $HOME/1_accuweather/curr_cond_raw "$curr_addr"
 
        daily_addr="$(echo $address|sed 's/weather-forecast.*$//')"daily-weather-forecast/"$last_number"
-       w3m -dump_source "$daily_addr" -o accept_encoding='identity;q=0' > $HOME/1_accuweather/daily_forecast
+       wget -U "Oh hi Mark!" -O $HOME/1_accuweather/daily_forecast "$daily_addr"
 
        if [[ $forecast2015 == 1 ]]; then
                rm $HOME/1_accuweather/forecast_2015/forecast_*.png
@@ -436,8 +436,8 @@ if [[ $hourly0 == 1 || $hourly2015 == 1 || $hourly2016 == 1 ]]; then
 
        hourly_addr1="$(echo $address|sed 's/weather-forecast.*$//')"hourly-weather-forecast/"$last_number"
        hourly_addr2="$(echo $address|sed 's/weather-forecast.*$//')"hourly-weather-forecast/"$last_number"?day=1
-       w3m -dump_source "$hourly_addr1" -o accept_encoding='identity;q=0' > $HOME/1_accuweather/hourly_raw1
-       w3m -dump_source "$hourly_addr2" -o accept_encoding='identity;q=0' > $HOME/1_accuweather/hourly_raw2
+       wget -U "Oh hi Mark!" -O $HOME/1_accuweather/hourly_raw1 "$hourly_addr1"
+       wget -U "Oh hi Mark!" -O $HOME/1_accuweather/hourly_raw2 "$hourly_addr1"
 
        if [[ -s $HOME/1_accuweather/hourly_raw1 && -s $HOME/1_accuweather/hourly_raw2 ]]; then
                sed -i '/var hourlyForecast/!d' $HOME/1_accuweather/hourly_raw1
diff --git a/CHANGELOG b/CHANGELOG
index 6a3eaa2..0d05927 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,5 @@
+2019-10-2: Changed from w3m to wget again, with a twist...
+
 -Final Release

I think it's the latest update.

Last edited by TeoBigusGeekus (2019-10-03 21:44:38)

morfik · 2019-10-03 21:45:39

Yes, you have to pull this now to the local repo. Then it will be in sync, then checkout to the other branch.

Last edited by morfik (2019-10-03 21:45:52)

TeoBigusGeekus · 2019-10-03 21:55:01

So, a git pull in the master branch, right?

#2881 2019-10-03 21:14:35

Re: Conky weather+moon scripts (Accuw/WUndergr/NWS/MoonGiant)

#2882 2019-10-03 21:15:47

Re: Conky weather+moon scripts (Accuw/WUndergr/NWS/MoonGiant)

#2883 2019-10-03 21:15:49

Re: Conky weather+moon scripts (Accuw/WUndergr/NWS/MoonGiant)

#2884 2019-10-03 21:18:49

Re: Conky weather+moon scripts (Accuw/WUndergr/NWS/MoonGiant)

#2885 2019-10-03 21:22:40

Re: Conky weather+moon scripts (Accuw/WUndergr/NWS/MoonGiant)

#2886 2019-10-03 21:23:38

Re: Conky weather+moon scripts (Accuw/WUndergr/NWS/MoonGiant)

#2887 2019-10-03 21:24:24

Re: Conky weather+moon scripts (Accuw/WUndergr/NWS/MoonGiant)

#2888 2019-10-03 21:24:28

Re: Conky weather+moon scripts (Accuw/WUndergr/NWS/MoonGiant)

#2889 2019-10-03 21:29:07

Re: Conky weather+moon scripts (Accuw/WUndergr/NWS/MoonGiant)

#2890 2019-10-03 21:30:00

Re: Conky weather+moon scripts (Accuw/WUndergr/NWS/MoonGiant)

#2891 2019-10-03 21:32:09

Re: Conky weather+moon scripts (Accuw/WUndergr/NWS/MoonGiant)

#2892 2019-10-03 21:34:50

Re: Conky weather+moon scripts (Accuw/WUndergr/NWS/MoonGiant)

#2893 2019-10-03 21:35:19

Re: Conky weather+moon scripts (Accuw/WUndergr/NWS/MoonGiant)

#2894 2019-10-03 21:36:13

Re: Conky weather+moon scripts (Accuw/WUndergr/NWS/MoonGiant)

#2895 2019-10-03 21:37:37

Re: Conky weather+moon scripts (Accuw/WUndergr/NWS/MoonGiant)

#2896 2019-10-03 21:38:57

Re: Conky weather+moon scripts (Accuw/WUndergr/NWS/MoonGiant)

#2897 2019-10-03 21:42:02

Re: Conky weather+moon scripts (Accuw/WUndergr/NWS/MoonGiant)

#2898 2019-10-03 21:44:11

Re: Conky weather+moon scripts (Accuw/WUndergr/NWS/MoonGiant)

#2899 2019-10-03 21:45:39

Re: Conky weather+moon scripts (Accuw/WUndergr/NWS/MoonGiant)

#2900 2019-10-03 21:55:01

Re: Conky weather+moon scripts (Accuw/WUndergr/NWS/MoonGiant)

Board footer