Terminal Juma'a: Patch and Diff

Biyu daga cikin mahimman kayan aikin haɓaka software sune patch y Bambanci. Ba asiri bane yadda suke aiki, amma ina tsammanin wannan zai zama matsayi mai ban sha'awa. 🙂

Dukansu suna da iko sosai, kuma wannan kamar taɓa farfajiya ne, suna da ƙarin abubuwan amfani da sauran ayyuka. Asali da waɗannan kayan aikin biyu zamu iya ƙirƙirar sarrafa sigar,

---

Bambanci

Muna nufin kwatancen, yana kwatancen fayil na "asali" da na "sabo", kuma yana sanar da mu bambance-bambancen dake tsakanin su. Hakanan wannan kayan aikin yana bamu damar kirkirar fayilolin patch da muke amfani dasu don kirkirar faci don shirye shiryen mu.

---

patch

Umurnin ne da a zahiri muke '' facin '' asalin fayil ɗinmu, tare da ƙarawa da / ko cire layuka bisa ga umarnin da ke ƙunshe cikin fayil ɗin .patch

---

Akwai kuma vimdiff, wanda kayan aiki ne na gani don amfani da faci ba tare da buƙatar fayil ɗin .patch ba, tunda yana kwatancen "asali" da "sabo" kuma a kan wannan fayil ɗin yana yiwuwa a gyara layi ta layi ko kuma duk takaddar. Wannan ba zan bayyana ba amma ina tsammanin ya cancanci ambata.

---

Misali

Yanzu fun shine. Misali!

Wannan haka lamarin yake, muna da babban rubutun da yake neman sunanka da shekarunka, idan ka wuce shekaru 18 sai yace maka zaka iya zabe, in ba haka ba yana nuna maka cewa baza ka iya zabe ba.

na asali.sh

#! / bin / bash echo "Shigar da sunanka:" karanta sunan amsa kuwwa "Shigar da shekarunka:" karanta shekaru idan [[18 -lt $ age]] to amsa kuwwa "Barka dai $ suna, ka tsufa $ kuma zaka iya zabe! " sake amsa kuwwa "Barka dai $ suna, ka tsufa $ kuma ba za ka iya zabe ba ..." fi

Anyi, ga rubutun da ke gudana:

Don haka, a matsayinmu na masu amfani da kyau, muna raba rubutun namu ga aboki :), amma mun sami saƙo cewa yana da lahani, cewa lokacin da ya kai 18 sai ya ce ba zai iya zaɓar lokacin da ya kamata ba.

Yanzu zamu fara gyara ƙananan kuskuren kuma muyi ɗan gyare-gyare ...

sabo.sh

#! / bin / bash maxAge = 18 amsa kuwwa "Shigar da sunanka:"; karanta sunan amsa kuwwa "Rubuta shekarunka:"; karanta shekaru idan [[$ maxAge -le $ age]]; sa'an nan kuma amsa kuwwa "Sannu $ sunan, kai shekara ta $ kuma za ku iya yin zaɓe!" kuma amsa kuwwa "Sannu $ sunan, kun kasance shekara $ kuma baza ku iya zaɓar ..." fi fita 0

Ace rubutun yayi nauyi sosai. Don haka, don kar a sake aika dukkan rubutun, mun ƙirƙiri .patch 😀

$ diff -u na asali.sh new.sh> patch.patch

Kuma yanzu muna da facinmu. Ga ra'ayi akan Vim:

Kuma don amfani da shi kawai muna amfani da fayil ɗin .patch a cikin rubutun don yin faci. Anan ake kira asaliAmigo.sh, wanda shine ainihin kwafin rubutun na asali.sh

$ facin asaliFriend.sh <patch.patch

Kuma wannan ya bar mana fayil dinmu asaliAmigo.sh Don haka:

Kamar yadda kake gani yana da sauƙi don samun rarrabu da amfani da faci. Duk daga wurina ne.

Assalamu alaikum jama'a, zamu karanta a Juma'a mai zuwa.