Compare two folders' contents in Terminal | Macworld

Compare two folders' contents in Terminal | Macworld

Have you ever wanted a quick way to compare two directories (folders), in order to see which files may differ between the two? Back in 2006, we discussed FileMerge (part of Apple’s Xcode developer tools), which can do just that. There are other third-party GUI tools as well, but there’s actually a free folder comparison tool built into every Mac—it just requires a quick trip to Terminal to put it to use. The program is called diff, and it’s quite simple to use.

Launch Terminal (in Applications -> Utilities), and then use the cd command to change to the directory containing the folders you’d like to compare. (The folders can be located anywhere, of course, but it’s easiest if they’re in the same folder.). Once there, just run this command:

diff -rq folder1 folder2

This is a pretty simple command, with two command-line switches (-rq). The r tells diff to look at each directory recursively, including subdirectories. The q switch sets diff brief mode. If we didn’t set brief mode, diff would not only tell you which files are different between the two folders, but also show the actual line-by-line differences for any text files that exist in both locations but are not identical. Given that we’re just interested in comparing the folders’ contents, we don’t need that level of detail, so we’ll use brief mode to suppress it.

How to Use Diff to Compare Files at the Command Line The diff is a command line tool, thus you must first launch the Terminal app, found in /Applicaitons/Utilities/ and then you’re ready to begin.
The basic syntax for diff at the command line is as follows:

diff (file input 1) (file input 2)

For example, if in the present directory we want to compare bash.txt and bash2.txt, the syntax would look like the following:

diff bash.txt bash2.txt

The -w flag can be handy for plain text files because it tells diff to ignore white space when comparing files. And of course you can use a full path to the files to compare as well if need be, for example to compare an edited hosts file with another version elsewhere:

diff -w /etc/hosts ~/Downloads/BlockEverythingHosts.txt

Sample output may look something like the following:
$ diff -w /etc/hosts ~/Downloads/BlockEverythingHosts.txt
0a1
< ## < 127.0.0.1 localhost > # time for a break
9a12
> 127.0.0.1 facebook.com

The greater than and less than symbols serve as pointer arrows of sorts, indicating which file the difference originated from in relation to the order presented in the original command syntax.

Nat Geo Explorer Lives Off the Grid in Florida

In the far corner of the front yard of a large house in Florida, an RV rests, shaded by trees as clothing on a nearby line sways in the breeze. In this RV, Nat Geo explorer Thomas Henry "T.H." Culhane lives with his wife, Enas Culhane, almost entirely off the grid.

https://www.nationalgeographic.com/environment/2018/08/th-culhane-explorer-off-grid-biogas-solar/

Sent from my iPhone :-)

Discovering What Democracy Means

Discovering What Democracy Means

As I watch and listen to our public discourse today, it seems to me we are all “institutionalized” in one form or another, locked away in our separate realities, our parochial loyalties, our fixed ways of seeing ourselves and others. For democracy to prosper it requires us to escape those bonds and join what John Dewey called “a life of free and enriching communion”—to become “We, the People.” The late James W. Carey, one of our noted scholars of communication, wrote that the very concept of “public” could once be defined as “a group of strangers who gather to discuss the news.” In early America the printing press generated a body of popular knowledge. Towns were small, and taverns, inns, coffeehouses, street corners, and the public greens—the commons—were places where people gathered to discuss what they were reading. These places of public communication “provided the underlying social fabric of the town and, when the Revolution began, made it possible to quickly gather militia companies, to form effective committees of correspondence and of inspection, and to organize and to manage mass town meetings.”

Wilson said in his day, “is whether we are big enough…whether we are free enough, to take possession again of the government which is our own.

ALBATROSS Our Story — Albatross

ALBATROSS Our Story — Albatross



The experience was devastating, not only for what it meant for the suffering of the birds, but also for what it reflected back to us about the destructive power of our culture of mass consumption, and humanity's damaged relationship with the living world.

Complicating the Narratives – The Whole Story

Complicating the Narratives – The Whole Story



For decades, economists assumed that human beings were reasonable actors, operating in a rational world. When people made mistakes in free markets, rational behavior would, it was assumed, generally prevail. Then, in the 1970s, psychologists like Daniel Kahneman began to challenge those assumptions. Their experiments showed that humans are subject to all manner of biases and illusions



“We are influenced by completely automatic things that we have no control over, and we don’t know we’re doing it,” as Kahneman put it. The good news was that these irrational behaviors are also highly predictable.



If we want to learn the truth, we have to find new ways to listen. If we want our best work to have consequences, we have to be heard. “Anyone who values truth,” social psychologist Jonathan Haidt wrote in The Righteous Mind, “should stop worshipping reason.”

We need to find ways to help our audiences leave their foxholes and consider new ideas. So we have a responsibility to use all the tools we can find — including the lessons of psychology.

“It’s time to stop making excuses,” as Nobel-prize winning economist Richard Thaler wrote in his book Misbehaving. He was speaking to economists but he could have been addressing journalists. “We need an enriched approach…that acknowledges the existence and relevance of Humans.”

Fwd: The Pope calls for citizen pressure? We Rise for Climate

Begin forwarded message:

From: "Sara Shor - 350.org" <350@350.org>

Pope Francis asked for "citizen pressure" ahead of the Global Climate Action Summit.

 

 

 

Eric,

This is big. Really big. Pope Francis just called for urgent collective action to repair the planet, and gave his blessing to 'citizen pressure groups' organizing ahead of the Global Climate Action Summit in September.¹ That means us.

Just before the Summit, we will call for decisive action on climate with actions across the globe and a mass march in San Francisco.

On September 8th, thousands of people will come together in San Francisco where the Summit is taking place, and in towns and cities across the world to demand our local leaders take bold action on climate change and commit to a Fossil Free world. Will you Rise for Climate with us?

At the Vatican Conference last week, Pope Francis made a clear declaration to Catholics and citizens worldwide: it is our duty and our moment to "cooperate in responsibly cultivating and protecting the Earth."

We will mobilize the weekend before the Summit to show that true climate leadership means nothing less than a fast, fair and just transition to 100% renewable energy that protects communities, creates jobs, and brings an immediate end to new fossil fuel projects.

We'll be demanding that local and civic leaders take real climate action - and each gathering, however big or small, will help build momentum. Each and every action around the U.S. will help bolster our efforts and show solidarity with communities impacted by the climate crisis.

It's up to us to make this more than a political flashpoint. Every city has been invited to make a commitment in the lead up to the Summit.² We must demand and help implement commitments to climate justice in our states, cities, places of worship and neighborhoods. 

Together, we will not stop fighting for a just and equitable future. Rise with us on September 8th.

Thanks for all you do,

Sara

P.S. - In other breaking news: Ireland just became the first country in the world to commit to divest! Read Bill McKibben's response to this momentous news. This is what people power can do.

---

¹ - Pope Francis calls for people power ahead of Climate Summit - 350 Press Release

² - Cities Urged to Step Up Climate Action and Ambition Ahead of Global Climate Action Summit - GCAS 

Check out events happening near you or register one at: riseforclimate.org

---

350.org is building a global climate movement. You can connect with us on Facebook, follow us on Twitter, and text 350 to 83224 to get important mobile action alerts.  Become a sustaining donor to keep this movement strong and growing. Looking for other ways to get involved? Check out our map to see if there's a local 350 group or event near you.

You can update your contact information, location, or language here, or if you're 100% sure you never want to hear from 350.org again you can click here to unsubscribe.

Fwd: 4 new tools educators will love.

Meet Schoolwork Now available, Schoolwork is a free app for iPad that lets you easily distribute and collect class assignments, see student progress within apps, and collaborate one-on-one with students from anywhere, in real time. Learn more   For Teachers: Getting Started with Schoolwork   For IT: Get Set Up for Schoolwork Download   Download A whole new way to apply Swift coding skills. The new Sensor Arcade challenge in Swift Playgrounds gets students hands-on with built-in sensors on iPad and real Swift code. And students can create their own mini-games, simulations, or interactive art with Sensor Create. The updated Learn to Code 3 Teacher Guide has lesson plans and project ideas for bringing these new Playgrounds into the classroom.   Swift Playgrounds   Swift Playgrounds: Learn to Code 3: Teacher Guide Download   Download Draw out your inner artist. Brush up on your drawing skills and find great ways to use sketching and doodling with students. Get inspired with drawing tutorials in the Apple Teacher Learning Center. Learn more     Tayasui Sketches School   Keynote   Pages Download   Download   Download Some content requires specific hardware or software. Internet access required; data fees may apply. Content prices and availability are subject to change. All rights reserved. Copyright © 2018 Apple Inc. One Apple Park Way, Cupertino, CA 95014 Privacy Policy  |  Terms & Conditions  |  Support  |  Account  |  Subscribe  |  Unsubscribe