Skip to content

Merged #7 & #5 for full-fun#5

Open
valerio-bozzolan wants to merge 2 commits intoLegolasTheElf:masterfrom
valerio-bozzolan:master
Open

Merged #7 & #5 for full-fun#5
valerio-bozzolan wants to merge 2 commits intoLegolasTheElf:masterfrom
valerio-bozzolan:master

Conversation

@valerio-bozzolan
Copy link
Copy Markdown

  • Added GPLv3 disclaimer;
  • Added help arg and help page;
  • Translating all the inline comments in English (one day .po & .mo for help page and "Mannaggia %s"?);
  • Increased execution speed (maniacally converting short "if then something fi" to "condition && something") (That does so much cool!);
  • Indented maniacally + tabbing (sorry but I love tabs);
  • Added --oneshot (Having param --single #2);
  • Rewritten options section (Rewritten options section #7);

In short word: This merge edits from @henryx and from @valerio-bozzolan.

So test:

tuxs=(tux cow gnu bunny sodomized-sheep pony vader meow);while true; do ./mannaggia.sh --audio --oneshot | cowsay -f ${tuxs[$RANDOM % ${#tuxs[@]} ]}; done

It's pretty lovely <3

http://owncloud.reyboz.it/public.php?service=files&t=39616703f47d69a7d27e680d609dfc85

(To forgive me by Piettro Suffritti [see])

Used spaces instead of tabs
@valerio-bozzolan valerio-bozzolan changed the title Please read all the edits Please see the full-description and try it to love it Oct 2, 2014
Added help arg and new help page (--help);
Translating all the inline comments in English (one day .po & .mo for help page and "Mannaggia %s"?);
Increased execution speed (maniacally converting short "if then something fi" to "condition && something") (That does so much cool!);
Indented maniacally;
Added --oneshot (LegolasTheElf#2);
Rewritten options section (LegolasTheElf#7);
In short word: This merge edits from @henryx and from @valerio-bozzolan.
@valerio-bozzolan valerio-bozzolan changed the title Please see the full-description and try it to love it Merged #7 & #5 for full-fun Oct 2, 2014
@valerio-bozzolan
Copy link
Copy Markdown
Author

Comunque per unire in fretta questo merge in quello di Legolas, secondo me basta un "git clone" dal mio (https://github.com/valerio-bozzolan/mannaggia.git) e un "git push" verso il repo di partenza di @LegolasTheElf, evitando così di passare dal sito che dice che ci sono conflitti e ottenendo come risultato che si uniranno tutti i cambiamenti da #5 e #7 nel repo di Legolas.

@rfc1459
Copy link
Copy Markdown
Contributor

rfc1459 commented Oct 2, 2014

Magari la prossima volta fai i commit su un branch separato e fai partire la pull request da lì, così per evitare i conflict e i commit merge fai un semplice rebase del branch e un force-push sul tuo repository (e così la pull request si aggiorna da sola)

@valerio-bozzolan
Copy link
Copy Markdown
Author

Ricevuto! :)

@henryx
Copy link
Copy Markdown
Collaborator

henryx commented Oct 2, 2014

(... e vi siete salvati che odio getopt e getopts :P )

@LegolasTheElf
Copy link
Copy Markdown
Owner

miii che casino pazzesco... adesso devo vedermi tutte le request per vedere chi è compatibile con chi... odioodioodio...

@valerio-bozzolan
Copy link
Copy Markdown
Author

Ovviamente devi includere questa, perchè ne includi due di colpo in tal modo u_u
E poi quella dell'audio è arrivata dopo.

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.

4 participants