cros_workon: simplify by symlinking the keywords file to the unmask file

cros_workon

 #!/bin/bash
 
 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This script moves ebuilds between 'stable' and 'live' states.
 # By default 'stable' ebuilds point at and build from source at the
 # last known good commit. Moving an ebuild to 'live' (via cros_workon start)
 # is intended to support development. The current source tip is fetched,
@@ skipping 50 matching lines @@
   EBUILDCMD=ebuild
 fi
 
 KEYWORDS_DIR=${BOARD_DIR}/etc/portage/package.keywords
 UNMASK_DIR=${BOARD_DIR}/etc/portage/package.unmask
 KEYWORDS_FILE=${KEYWORDS_DIR}/cros-workon
 UNMASK_FILE=${UNMASK_DIR}/cros-workon
 
 sudo mkdir -p "${KEYWORDS_DIR}" "${UNMASK_DIR}" || \
   die "mkdir -p ${KEYWORDS_DIR} ${UNMASK_DIR}"
-sudo touch "${KEYWORDS_FILE}" "${UNMASK_FILE}" || \
-  die "touch ${KEYWORDS_FILE} ${UNMASK_FILE}"
+if [ ! -L "${KEYWORDS_FILE}" ]; then
+  sudo rm -f "${KEYWORDS_FILE}"
+  sudo ln -s "${UNMASK_FILE}" "${KEYWORDS_FILE}" || \
+    die "ln -s ${UNMASK_FILE} ${KEYWORDS_FILE}"
+fi
+sudo touch "${UNMASK_FILE}" || \
+  die "touch ${UNMASK_FILE}"
 
 # Canonicalize package name to category/package.
 canonicalize_name () {
   local pkgfile
   local pkgname
 
   if ! pkgfile=$(ACCEPT_KEYWORDS="**" ${EQUERYCMD} which $1); then
     warn "error looking up package $1" 1>&2
     return 1
   fi
@@ skipping 18 matching lines @@
     local name=$(canonicalize_name "${atom}")
     [ -n "${name}" ] || return 1
     names+=" ${name}"
   done
 
   echo "${names}"
 }
 
 # Display ebuilds currently part of the live branch and open for development.
 show_live_ebuilds () {
-  cat "${KEYWORDS_FILE}"
+  sed -n 's/^[~=]\(.*\)-9999$/\1/p' "${UNMASK_FILE}"
 }
 
 find_repo_dir () {
   curdir=`pwd`
   while [ $curdir != / ]; do
     if [ -d "$curdir/.repo" ]; then
        #echo "Found .repo directory at ${curdir}"
        REPODIR=${curdir}/.repo
        return 0
     fi
     curdir=`dirname "$curdir"`
   done
   echo "Unable to find .repo directory. Did you checkout with repo?"
   exit 1
 }
 
 
 # This is called only for "cros-workon start". We dont handle the "stop" case since the local changes are ignored anyway since the 9999.ebuild is masked and we dont want to deal with what to do with the user's local changes.
 regen_manifest_and_sync() {
   find_repo_dir
   local_manifest="${REPODIR}/local_manifest.xml"
 
   # preserve old manifest entries
   [ -f "${local_manifest}" ] && \
     MANIFEST_ENTRIES_OLD=$(cat "${local_manifest}" | grep "^<project")
 
   rm -f "${local_manifest}"
 
   # get new manifest entries
-  MANIFEST_ENTRIES=$(cat ${KEYWORDS_FILE} |
+  MANIFEST_ENTRIES=$(show_live_ebuilds |
   {
     while read line
     do
       pkgname=`basename ${line}`
       eval $(${EBUILDCMD} $(${EQUERYCMD} which ${pkgname}) info)
       REPO_ELEMENT=$(sed -n '/START_MINILAYOUT/,/STOP_MINILAYOUT/p' $REPODIR/manifest.xml | grep "name=\"${CROS_WORKON_PROJECT}\"" | sed -e 's/^[ \t]*//')
       echo "$REPO_ELEMENT"
     done
   })
 
   if [ -n "${MANIFEST_ENTRIES}" ] || [ -n "${MANIFEST_ENTRIES_OLD}" ]; then
     info "Creating local manifest for workon packages.."
     echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" >> "${local_manifest}"
     echo "<manifest>" >> "${local_manifest}"
     echo -e "${MANIFEST_ENTRIES}\n${MANIFEST_ENTRIES_OLD}" \
       | sort | uniq >> "${local_manifest}"
     echo "</manifest>" >> "${local_manifest}"
     echo "Please run \"repo sync\" now."
   fi
 }
 
 # Move a stable ebuild to the live development catgeory.  The ebuild
 # src_unpack step fetches the package source for local development.
 ebuild_to_live () {
   local atoms=$1
 
   for atom in ${atoms}; do
-    if ! grep -qx "${atom}" "${KEYWORDS_FILE}" ; then
-      sudo bash -c "echo \"${atom}\" >> \"${KEYWORDS_FILE}\""
-      sudo bash -c "echo \"~${atom}-9999\" >> \"${UNMASK_FILE}\""
+    if ! grep -qx "[~=]${atom}-9999" "${UNMASK_FILE}" ; then
+      sudo bash -c "echo \"=${atom}-9999\" >> \"${UNMASK_FILE}\""
     else
       warn "Already working on ${atom}"
     fi
   done
 }
 
 # Move a live development ebuild back to stable.
 ebuild_to_stable () {
   local atoms=$1
 
   for atom in ${atoms}; do
-    if grep -qx "${atom}" "${KEYWORDS_FILE}" ; then
-      # remove the keyword
-      sudo bash -c "grep -v '^${atom}\$' \"${KEYWORDS_FILE}\" > \
-          \"${KEYWORDS_FILE}+\""
-      sudo mv "${KEYWORDS_FILE}+" "${KEYWORDS_FILE}"
-      # remove the unmask
-      sudo bash -c "grep -v '^~${atom}-9999\$' \"${UNMASK_FILE}\" > \
+    if grep -qx "[~=]${atom}-9999" "${UNMASK_FILE}" ; then
+      sudo bash -c "grep -v '^[~=]${atom}-9999\$' \"${UNMASK_FILE}\" > \
           \"${UNMASK_FILE}+\""
       sudo mv "${UNMASK_FILE}+" "${UNMASK_FILE}"
     else
       warn "Not working on ${atom}"
     fi
   done
 }
 
 # Run a command on all or a set of repos.
 ebuild_iterate() {
@@ skipping 27 matching lines @@
   esac
 fi
 
 case ${WORKON_CMD} in
   start)  ebuild_to_live "${ATOM_LIST}"; regen_manifest_and_sync ;;
   stop)   ebuild_to_stable "${ATOM_LIST}" ;;
   list)   [ ${FLAGS_all} = "${FLAGS_FALSE}" ] && show_live_ebuilds || show_workon_ebuilds ;;
   iterate)ebuild_iterate "${ATOM_LIST}" ;;
   *)      die "invalid cros_workon command" ;;
 esac