| // this is the background code... | |
| // listen for our browerAction to be clicked | |
| chrome.browserAction.onClicked.addListener(function (tab) { | |
| // for the current tab, inject the "inject.js" file & execute it | |
| chrome.tabs.executeScript(tab.ib, { | |
| file: 'inject.js' | |
| }); | |
| }); |
| <?php | |
| define('APP_PATH', dirname(__FILE__)); | |
| define('DATA_FILE', APP_PATH. '/sms.htdata'); | |
| if ($_SERVER['REQUEST_METHOD'] == 'POST') { //tasker提交 | |
| if (!isset($_POST['c'])) { | |
| die('Invalid Request!'); | |
| } else { | |
| $data = ''; | |
| if (file_exists(DATA_FILE)) { //读入已有数据 |
| #!/bin/bash | |
| # | |
| # Example of how to parse short/long options with 'getopt' | |
| # | |
| OPTS=`getopt -o vhns: --long verbose,dry-run,help,stack-size: -n 'parse-options' -- "$@"` | |
| if [ $? != 0 ] ; then echo "Failed parsing options." >&2 ; exit 1 ; fi | |
| echo "$OPTS" |
| Subject: Thanks for signing up! | |
| Date: {{date}} | |
| To: {{recipient}} | |
| From: {{sender}} | |
| MIME-Version: 1.0 | |
| Content-Type: text/plain | |
| Thanks for signing up for the Foobar service! | |
| Your email address is: {{recipient}} |
FileMerge (opendiff) can really come in handy when you need to visually compare merging conflicts. Other times it's just a nice visual way to review your days work.
The following method works by creating a simple bash script (git-diff-cmd.sh) that sets us up with the proper command line arguments for Git to pass off files to FileMerge.
